1 diff -uNr requests/adapters.py requests.new/adapters.py
2 --- requests/adapters.py 2013-05-20 22:10:43.000000000 +0200
3 +++ requests.new/adapters.py 2013-06-26 22:46:17.947032253 +0200
7 from .models import Response
8 -from .packages.urllib3.poolmanager import PoolManager, ProxyManager
9 -from .packages.urllib3.response import HTTPResponse
10 +from urllib3.poolmanager import PoolManager, ProxyManager
11 +from urllib3.response import HTTPResponse
12 from .compat import urlparse, basestring, urldefrag, unquote
13 from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
14 prepend_scheme_if_needed, get_auth_from_url)
15 from .structures import CaseInsensitiveDict
16 -from .packages.urllib3.exceptions import MaxRetryError
17 -from .packages.urllib3.exceptions import TimeoutError
18 -from .packages.urllib3.exceptions import SSLError as _SSLError
19 -from .packages.urllib3.exceptions import HTTPError as _HTTPError
20 +from urllib3.exceptions import MaxRetryError
21 +from urllib3.exceptions import TimeoutError
22 +from urllib3.exceptions import SSLError as _SSLError
23 +from urllib3.exceptions import HTTPError as _HTTPError
24 from .cookies import extract_cookies_to_jar
25 from .exceptions import ConnectionError, Timeout, SSLError
26 from .auth import _basic_auth_str
27 diff -uNr requests/compat.py requests.new/compat.py
28 --- requests/compat.py 2013-01-31 14:18:16.000000000 +0100
29 +++ requests.new/compat.py 2013-06-26 22:48:20.473035139 +0200
34 -from .packages import charade as chardet
35 +import charade as chardet
41 from Cookie import Morsel
42 from StringIO import StringIO
43 - from .packages.urllib3.packages.ordered_dict import OrderedDict
44 + from urllib3.packages.ordered_dict import OrderedDict
48 diff -uNr requests/__init__.py requests.new/__init__.py
49 --- requests/__init__.py 2013-05-25 18:47:20.000000000 +0200
50 +++ requests.new/__init__.py 2013-06-26 22:45:40.990565797 +0200
53 # Attempt to enable urllib3's SNI support, if possible
55 - from requests.packages.urllib3.contrib import pyopenssl
56 + from urllib3.contrib import pyopenssl
57 pyopenssl.inject_into_urllib3()
60 diff -uNr requests/models.py requests.new/models.py
61 --- requests/models.py 2013-05-25 18:47:00.000000000 +0200
62 +++ requests.new/models.py 2013-06-26 22:47:26.743326218 +0200
65 from .auth import HTTPBasicAuth
66 from .cookies import cookiejar_from_dict, get_cookie_header
67 -from .packages.urllib3.filepost import encode_multipart_formdata
68 -from .packages.urllib3.util import parse_url
69 +from urllib3.filepost import encode_multipart_formdata
70 +from urllib3.util import parse_url
71 from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
73 guess_filename, get_auth_from_url, requote_uri,