Arun S A G 1b6b3fe
diff -up ./requests/adapters.py.orig ./requests/adapters.py
Arun S A G 1b6b3fe
--- ./requests/adapters.py.orig	2014-05-30 00:27:36.151074219 -0700
Arun S A G 1b6b3fe
+++ ./requests/adapters.py	2014-05-30 00:31:26.712662414 -0700
Arun S A G 1b6b3fe
@@ -11,18 +11,18 @@ and maintain connections.
2f898f2
 import socket
2f898f2
 
2f898f2
 from .models import Response
d75372e
-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
2f898f2
-from .packages.urllib3.response import HTTPResponse
d75372e
-from .packages.urllib3.util import Timeout as TimeoutSauce
d75372e
+from urllib3.poolmanager import PoolManager, proxy_from_url
2f898f2
+from urllib3.response import HTTPResponse
d75372e
+from urllib3.util import Timeout as TimeoutSauce
9c75512
 from .compat import urlparse, basestring, urldefrag, unquote
2f898f2
 from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
Arun S A G 1b6b3fe
                     prepend_scheme_if_needed, get_auth_from_url)
2f898f2
 from .structures import CaseInsensitiveDict
2f898f2
-from .packages.urllib3.exceptions import MaxRetryError
2f898f2
-from .packages.urllib3.exceptions import TimeoutError
2f898f2
-from .packages.urllib3.exceptions import SSLError as _SSLError
2f898f2
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
Arun S A G 1b6b3fe
-from .packages.urllib3.exceptions import ProxyError as _ProxyError
2f898f2
+from urllib3.exceptions import MaxRetryError
2f898f2
+from urllib3.exceptions import TimeoutError
2f898f2
+from urllib3.exceptions import SSLError as _SSLError
2f898f2
+from urllib3.exceptions import HTTPError as _HTTPError
Arun S A G 1b6b3fe
+from urllib3.exceptions import ProxyError as _ProxyError
2f898f2
 from .cookies import extract_cookies_to_jar
Arun S A G 1b6b3fe
 from .exceptions import ConnectionError, Timeout, SSLError, ProxyError
9c75512
 from .auth import _basic_auth_str
Arun S A G 1b6b3fe
diff -up ./requests/compat.py.orig ./requests/compat.py
Arun S A G 1b6b3fe
--- ./requests/compat.py.orig	2014-05-30 00:46:53.888049149 -0700
Arun S A G 1b6b3fe
+++ ./requests/compat.py	2014-05-30 00:54:17.647105931 -0700
9c75512
@@ -89,7 +89,10 @@ if is_py2:
2f898f2
     import cookielib
2f898f2
     from Cookie import Morsel
2f898f2
     from StringIO import StringIO
2f898f2
-    from .packages.urllib3.packages.ordered_dict import OrderedDict
2f898f2
+    try:
2f898f2
+        from collections import OrderedDict
2f898f2
+    except ImportError:
2f898f2
+        from ordereddict import OrderedDict
d75372e
     from httplib import IncompleteRead
2f898f2
 
2f898f2
     builtin_str = str
Arun S A G 1b6b3fe
diff -up ./requests/exceptions.py.orig ./requests/exceptions.py
Arun S A G 1b6b3fe
--- ./requests/exceptions.py.orig	2014-05-30 00:59:00.825056566 -0700
Arun S A G 1b6b3fe
+++ ./requests/exceptions.py	2014-05-30 00:59:13.416143297 -0700
Arun S A G 1b6b3fe
@@ -7,7 +7,7 @@ requests.exceptions
Arun S A G 1b6b3fe
 This module contains the set of Requests' exceptions.
Arun S A G 1b6b3fe
 
Arun S A G 1b6b3fe
 """
Arun S A G 1b6b3fe
-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
Arun S A G 1b6b3fe
+from urllib3.exceptions import HTTPError as BaseHTTPError
Arun S A G 1b6b3fe
 
Arun S A G 1b6b3fe
 
Arun S A G 1b6b3fe
 class RequestException(IOError):
Arun S A G 1b6b3fe
diff -up ./requests/__init__.py.orig ./requests/__init__.py
Arun S A G 1b6b3fe
--- ./requests/__init__.py.orig	2014-05-30 00:27:56.025211120 -0700
Arun S A G 1b6b3fe
+++ ./requests/__init__.py	2014-05-30 00:54:37.009239302 -0700
Arun S A G 1b6b3fe
@@ -48,13 +48,6 @@ __author__ = 'Kenneth Reitz'
Arun S A G 1b6b3fe
 __license__ = 'Apache 2.0'
Arun S A G 1b6b3fe
 __copyright__ = 'Copyright 2014 Kenneth Reitz'
Arun S A G 1b6b3fe
 
Arun S A G 1b6b3fe
-# Attempt to enable urllib3's SNI support, if possible
Arun S A G 1b6b3fe
-try:
Arun S A G 1b6b3fe
-    from .packages.urllib3.contrib import pyopenssl
Arun S A G 1b6b3fe
-    pyopenssl.inject_into_urllib3()
Arun S A G 1b6b3fe
-except ImportError:
Arun S A G 1b6b3fe
-    pass
Arun S A G 1b6b3fe
-
Arun S A G 1b6b3fe
 from . import utils
Arun S A G 1b6b3fe
 from .models import Request, Response, PreparedRequest
Arun S A G 1b6b3fe
 from .api import request, get, head, post, patch, put, delete, options
Arun S A G 1b6b3fe
diff -up ./requests/models.py.orig ./requests/models.py
Arun S A G 1b6b3fe
--- ./requests/models.py.orig	2014-05-30 00:27:18.926955573 -0700
Arun S A G 1b6b3fe
+++ ./requests/models.py	2014-05-30 00:31:12.714565990 -0700
Arun S A G 1b6b3fe
@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveD
2f898f2
 
2f898f2
 from .auth import HTTPBasicAuth
2f898f2
 from .cookies import cookiejar_from_dict, get_cookie_header
Arun S A G 1b6b3fe
-from .packages.urllib3.fields import RequestField
2f898f2
-from .packages.urllib3.filepost import encode_multipart_formdata
9c75512
-from .packages.urllib3.util import parse_url
Arun S A G 1b6b3fe
-from .packages.urllib3.exceptions import DecodeError
Arun S A G 1b6b3fe
+from urllib3.fields import RequestField
2f898f2
+from urllib3.filepost import encode_multipart_formdata
9c75512
+from urllib3.util import parse_url
Arun S A G 1b6b3fe
+from urllib3.exceptions import DecodeError
d75372e
 from .exceptions import (
d75372e
     HTTPError, RequestException, MissingSchema, InvalidURL,
Arun S A G 1b6b3fe
     ChunkedEncodingError, ContentDecodingError)