]>
Commit | Line | Data |
---|---|---|
9e57f9c2 AM |
1 | diff -urN requests-2.4.1.org/requests/adapters.py requests-2.4.1/requests/adapters.py |
2 | --- requests-2.4.1.org/requests/adapters.py 2014-09-09 18:31:17.000000000 +0200 | |
3 | +++ requests-2.4.1/requests/adapters.py 2014-09-24 15:13:26.999475101 +0200 | |
4 | @@ -11,21 +11,21 @@ | |
2d9e9bd0 ŁK |
5 | import socket |
6 | ||
7 | from .models import Response | |
9e57f9c2 | 8 | -from .packages.urllib3 import Retry |
23ad999c | 9 | -from .packages.urllib3.poolmanager import PoolManager, proxy_from_url |
2d9e9bd0 | 10 | -from .packages.urllib3.response import HTTPResponse |
23ad999c | 11 | -from .packages.urllib3.util import Timeout as TimeoutSauce |
9e57f9c2 | 12 | +from urllib3 import Retry |
23ad999c | 13 | +from urllib3.poolmanager import PoolManager, proxy_from_url |
2d9e9bd0 | 14 | +from urllib3.response import HTTPResponse |
23ad999c | 15 | +from urllib3.util import Timeout as TimeoutSauce |
9e57f9c2 | 16 | from .compat import urlparse, basestring, urldefrag |
2d9e9bd0 | 17 | from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, |
b906e79c | 18 | prepend_scheme_if_needed, get_auth_from_url) |
2d9e9bd0 | 19 | from .structures import CaseInsensitiveDict |
9e57f9c2 | 20 | -from .packages.urllib3.exceptions import ConnectTimeoutError |
2d9e9bd0 | 21 | -from .packages.urllib3.exceptions import HTTPError as _HTTPError |
9e57f9c2 | 22 | -from .packages.urllib3.exceptions import MaxRetryError |
23ad999c | 23 | -from .packages.urllib3.exceptions import ProxyError as _ProxyError |
9e57f9c2 AM |
24 | -from .packages.urllib3.exceptions import ProtocolError |
25 | -from .packages.urllib3.exceptions import ReadTimeoutError | |
26 | -from .packages.urllib3.exceptions import SSLError as _SSLError | |
27 | +from urllib3.exceptions import ConnectTimeoutError | |
2d9e9bd0 | 28 | +from urllib3.exceptions import HTTPError as _HTTPError |
9e57f9c2 | 29 | +from urllib3.exceptions import MaxRetryError |
23ad999c | 30 | +from urllib3.exceptions import ProxyError as _ProxyError |
9e57f9c2 AM |
31 | +from urllib3.exceptions import ProtocolError |
32 | +from urllib3.exceptions import ReadTimeoutError | |
33 | +from urllib3.exceptions import SSLError as _SSLError | |
2d9e9bd0 | 34 | from .cookies import extract_cookies_to_jar |
9e57f9c2 AM |
35 | from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError, |
36 | ProxyError) | |
37 | diff -urN requests-2.4.1.org/requests/compat.py requests-2.4.1/requests/compat.py | |
38 | --- requests-2.4.1.org/requests/compat.py 2014-08-19 18:52:58.000000000 +0200 | |
39 | +++ requests-2.4.1/requests/compat.py 2014-09-24 15:14:24.687597504 +0200 | |
2d9e9bd0 ŁK |
40 | @@ -4,7 +4,7 @@ |
41 | pythoncompat | |
42 | """ | |
43 | ||
b906e79c | 44 | -from .packages import chardet |
2d9e9bd0 ŁK |
45 | +import charade as chardet |
46 | ||
47 | import sys | |
48 | ||
9e57f9c2 | 49 | @@ -91,7 +91,7 @@ |
2d9e9bd0 ŁK |
50 | import cookielib |
51 | from Cookie import Morsel | |
52 | from StringIO import StringIO | |
53 | - from .packages.urllib3.packages.ordered_dict import OrderedDict | |
54 | + from urllib3.packages.ordered_dict import OrderedDict | |
55 | ||
56 | builtin_str = str | |
9e57f9c2 AM |
57 | bytes = str |
58 | diff -urN requests-2.4.1.org/requests/exceptions.py requests-2.4.1/requests/exceptions.py | |
59 | --- requests-2.4.1.org/requests/exceptions.py 2014-09-09 18:31:17.000000000 +0200 | |
60 | +++ requests-2.4.1/requests/exceptions.py 2014-09-24 15:13:27.002808518 +0200 | |
b906e79c AM |
61 | @@ -7,7 +7,7 @@ |
62 | This module contains the set of Requests' exceptions. | |
63 | ||
64 | """ | |
65 | -from .packages.urllib3.exceptions import HTTPError as BaseHTTPError | |
66 | +from urllib3.exceptions import HTTPError as BaseHTTPError | |
67 | ||
68 | ||
69 | class RequestException(IOError): | |
9e57f9c2 AM |
70 | diff -urN requests-2.4.1.org/requests/__init__.py requests-2.4.1/requests/__init__.py |
71 | --- requests-2.4.1.org/requests/__init__.py 2014-09-09 18:34:25.000000000 +0200 | |
72 | +++ requests-2.4.1/requests/__init__.py 2014-09-24 15:13:27.002808518 +0200 | |
2d9e9bd0 ŁK |
73 | @@ -50,7 +50,7 @@ |
74 | ||
75 | # Attempt to enable urllib3's SNI support, if possible | |
76 | try: | |
23ad999c | 77 | - from .packages.urllib3.contrib import pyopenssl |
2d9e9bd0 ŁK |
78 | + from urllib3.contrib import pyopenssl |
79 | pyopenssl.inject_into_urllib3() | |
80 | except ImportError: | |
81 | pass | |
9e57f9c2 AM |
82 | diff -urN requests-2.4.1.org/requests/models.py requests-2.4.1/requests/models.py |
83 | --- requests-2.4.1.org/requests/models.py 2014-08-19 18:52:58.000000000 +0200 | |
84 | +++ requests-2.4.1/requests/models.py 2014-09-24 15:13:27.002808518 +0200 | |
b906e79c | 85 | @@ -16,10 +16,10 @@ |
2d9e9bd0 ŁK |
86 | |
87 | from .auth import HTTPBasicAuth | |
88 | from .cookies import cookiejar_from_dict, get_cookie_header | |
23ad999c | 89 | -from .packages.urllib3.fields import RequestField |
2d9e9bd0 ŁK |
90 | -from .packages.urllib3.filepost import encode_multipart_formdata |
91 | -from .packages.urllib3.util import parse_url | |
9e57f9c2 | 92 | -from .packages.urllib3.exceptions import ( |
23ad999c | 93 | +from urllib3.fields import RequestField |
2d9e9bd0 ŁK |
94 | +from urllib3.filepost import encode_multipart_formdata |
95 | +from urllib3.util import parse_url | |
9e57f9c2 AM |
96 | +from urllib3.exceptions import ( |
97 | DecodeError, ReadTimeoutError, ProtocolError) | |
23ad999c ŁK |
98 | from .exceptions import ( |
99 | HTTPError, RequestException, MissingSchema, InvalidURL, | |
9e57f9c2 AM |
100 | diff -urN requests-2.4.1.org/setup.py requests-2.4.1/setup.py |
101 | --- requests-2.4.1.org/setup.py 2014-09-09 18:31:17.000000000 +0200 | |
102 | +++ requests-2.4.1/setup.py 2014-09-24 15:14:43.654742562 +0200 | |
103 | @@ -18,13 +18,6 @@ | |
23ad999c ŁK |
104 | |
105 | packages = [ | |
9e57f9c2 | 106 | 'requests', |
23ad999c | 107 | - 'requests.packages', |
b906e79c | 108 | - 'requests.packages.chardet', |
23ad999c ŁK |
109 | - 'requests.packages.urllib3', |
110 | - 'requests.packages.urllib3.packages', | |
111 | - 'requests.packages.urllib3.contrib', | |
b906e79c AM |
112 | - 'requests.packages.urllib3.util', |
113 | - 'requests.packages.urllib3.packages.ssl_match_hostname', | |
23ad999c ŁK |
114 | ] |
115 | ||
116 | requires = [] |