1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
--- requests-1.0.0/requests/adapters.py
+++ requests-1.0.0/requests/adapters.py
@@ -13,15 +13,15 @@
from .models import Response
from .auth import HTTPProxyAuth
-from .packages.urllib3.poolmanager import PoolManager
+from urllib3.poolmanager import PoolManager
from .hooks import dispatch_hook
from .compat import urlparse
from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
from .structures import CaseInsensitiveDict
-from .packages.urllib3.exceptions import MaxRetryError
-from .packages.urllib3.exceptions import TimeoutError
-from .packages.urllib3.exceptions import SSLError as _SSLError
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
+from urllib3.exceptions import MaxRetryError
+from urllib3.exceptions import TimeoutError
+from urllib3.exceptions import SSLError as _SSLError
+from urllib3.exceptions import HTTPError as _HTTPError
from .cookies import extract_cookies_to_jar
from .exceptions import ConnectionError, Timeout, SSLError
--- requests-1.0.0/requests/compat.py
+++ requests-1.0.0/requests/compat.py
@@ -4,7 +4,7 @@
pythoncompat
"""
-from .packages import charade as chardet
+import charade as chardet
import sys
@@ -89,7 +89,7 @@
import cookielib
from Cookie import Morsel
from StringIO import StringIO
- from .packages.urllib3.packages.ordered_dict import OrderedDict
+ from urllib3.packages.ordered_dict import OrderedDict
builtin_str = str
bytes = str
--- requests-1.0.0/requests/models.py
+++ requests-1.0.0/requests/models.py
@@ -17,7 +17,7 @@
from .auth import HTTPBasicAuth, HTTPProxyAuth
from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
-from .packages.urllib3.filepost import encode_multipart_formdata
+from urllib3.filepost import encode_multipart_formdata
from .exceptions import (
ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
URLRequired, SSLError, MissingSchema, InvalidSchema, InvalidURL)
--- requests-1.0.0/setup.py
+++ requests-1.0.0/setup.py
@@ -16,11 +16,6 @@
packages = [
'requests',
- 'requests.packages',
- 'requests.packages.charade',
- 'requests.packages.urllib3',
- 'requests.packages.urllib3.packages',
- 'requests.packages.urllib3.packages.ssl_match_hostname'
]
requires = []
|
GitWeb
