From 10d9eac5740d1019c4a73e4da948a8f564a9ce18 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Mon, 2 Nov 2015 23:24:01 +0100
Subject: [PATCH] Remove support for very old versions of "requests".

---
 dosagelib/util.py | 19 ++++---------------
 requirements.txt  |  2 +-
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/dosagelib/util.py b/dosagelib/util.py
index 0f54ca92f..65a5d76f6 100644
--- a/dosagelib/util.py
+++ b/dosagelib/util.py
@@ -55,11 +55,6 @@ ConnectionTimeoutSecs = 60
 UrlEncoding = "utf-8"
 
 
-if hasattr(requests, 'adapters'):
-    # requests >= 1.0
-    requests.adapters.DEFAULT_RETRIES = MaxRetries
-
-
 def get_system_uid():
     """Get a (probably) unique ID to identify a system.
     Used to differentiate votes.
@@ -305,22 +300,16 @@ def urlopen(url, session, referrer=None, max_content_bytes=None,
     kwargs = {
         "headers": headers,
         "timeout": timeout,
+        "stream": stream,
     }
-    if hasattr(requests, 'adapters'):
-        # requests >= 1.0
-        kwargs["stream"] = stream
-    else:
-        # requests << 1.0
-        kwargs["prefetch"] = not stream
-        kwargs["config"] = {"max_retries": MaxRetries}
     if data is None:
-        func = session.get
+        method = 'GET'
     else:
         kwargs['data'] = data
-        func = session.post
+        method = 'POST'
         out.debug(u'Sending POST data %s' % data, level=3)
     try:
-        req = func(url, **kwargs)
+        req = session.request(method, url, **kwargs)
         out.debug(u'Response cookies: %s' % req.cookies)
         check_content_size(url, req.headers, max_content_bytes)
         if raise_for_status:
diff --git a/requirements.txt b/requirements.txt
index b86af7c1b..2ea5688d4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # required:
-requests
+requests>=2.0
 # optional:
 argcomplete
 lxml