Latest major upstream release - requests-2.0.0

python-requests-system-urllib3.patch

@@ -1,17 +1,17 @@
-From 3ca53c8ba4557fc04c98c2b3b6aced09ddac6f7b Mon Sep 17 00:00:00 2001
+From c3fcc7597106553ad7b495a22535645617e20e18 Mon Sep 17 00:00:00 2001
 From: Ralph Bean <rbean@redhat.com>
-Date: Mon, 1 Jul 2013 15:00:59 -0400
+Date: Wed, 25 Sep 2013 09:05:31 -0400
 Subject: [PATCH 3/3] system urllib3
 
 ---
  requests/__init__.py |  7 -------
- requests/adapters.py | 12 ++++++------
+ requests/adapters.py | 14 +++++++-------
  requests/compat.py   |  5 ++++-
  requests/models.py   |  4 ++--
- 4 files changed, 12 insertions(+), 16 deletions(-)
+ 4 files changed, 13 insertions(+), 17 deletions(-)
 
 diff --git a/requests/__init__.py b/requests/__init__.py
-index 1af8d8e..8bc9843 100644
+index 837f0df..a28977d 100644
 --- a/requests/__init__.py
 +++ b/requests/__init__.py
 @@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz'
@@ -20,7 +20,7 @@ index 1af8d8e..8bc9843 100644
  
 -# Attempt to enable urllib3's SNI support, if possible
 -try:
--    from requests.packages.urllib3.contrib import pyopenssl
+-    from .packages.urllib3.contrib import pyopenssl
 -    pyopenssl.inject_into_urllib3()
 -except ImportError:
 -    pass
@@ -29,20 +29,22 @@ index 1af8d8e..8bc9843 100644
  from .models import Request, Response, PreparedRequest
  from .api import request, get, head, post, patch, put, delete, options
 diff --git a/requests/adapters.py b/requests/adapters.py
-index 98b7317..9ec3b1d 100644
+index d557b74..577bced 100644
 --- a/requests/adapters.py
 +++ b/requests/adapters.py
-@@ -11,16 +11,16 @@ and maintain connections.
+@@ -11,17 +11,17 @@ and maintain connections.
  import socket
  
  from .models import Response
--from .packages.urllib3.poolmanager import PoolManager, ProxyManager
+-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 -from .packages.urllib3.response import HTTPResponse
-+from urllib3.poolmanager import PoolManager, ProxyManager
+-from .packages.urllib3.util import Timeout as TimeoutSauce
++from urllib3.poolmanager import PoolManager, proxy_from_url
 +from urllib3.response import HTTPResponse
++from urllib3.util import Timeout as TimeoutSauce
  from .compat import urlparse, basestring, urldefrag, unquote
  from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
-                     prepend_scheme_if_needed, get_auth_from_url)
+                     except_on_missing_scheme, get_auth_from_url)
  from .structures import CaseInsensitiveDict
 -from .packages.urllib3.exceptions import MaxRetryError
 -from .packages.urllib3.exceptions import TimeoutError
@@ -56,7 +58,7 @@ index 98b7317..9ec3b1d 100644
  from .exceptions import ConnectionError, Timeout, SSLError
  from .auth import _basic_auth_str
 diff --git a/requests/compat.py b/requests/compat.py
-index 93f6bb6..8b4a3bd 100644
+index 62bfef9..b394b17 100644
 --- a/requests/compat.py
 +++ b/requests/compat.py
 @@ -89,7 +89,10 @@ if is_py2:
@@ -68,11 +70,11 @@ index 93f6bb6..8b4a3bd 100644
 +        from collections import OrderedDict
 +    except ImportError:
 +        from ordereddict import OrderedDict
+     from httplib import IncompleteRead
  
      builtin_str = str
-     bytes = str
 diff --git a/requests/models.py b/requests/models.py
-index 6cf2aaa..8a0ae9a 100644
+index 8fd9735..7df85c1 100644
 --- a/requests/models.py
 +++ b/requests/models.py
 @@ -17,8 +17,8 @@ from .structures import CaseInsensitiveDict
@@ -83,9 +85,9 @@ index 6cf2aaa..8a0ae9a 100644
 -from .packages.urllib3.util import parse_url
 +from urllib3.filepost import encode_multipart_formdata
 +from urllib3.util import parse_url
- from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
- from .utils import (
-     guess_filename, get_auth_from_url, requote_uri,
+ from .exceptions import (
+     HTTPError, RequestException, MissingSchema, InvalidURL,
+     ChunkedEncodingError)
 -- 
-1.8.1.4
+1.8.3.1