|
1 In-house patch to remove the imports of local copies of six and ordered_dict. |
|
2 |
|
3 --- urllib3-1.10.4/urllib3/_collections.py.orig 2015-05-08 13:09:35.593680366 -0600 |
|
4 +++ urllib3-1.10.4/urllib3/_collections.py 2015-05-08 13:10:02.486402310 -0600 |
|
5 @@ -10,11 +10,8 @@ except ImportError: # Platform-specific |
|
6 pass |
|
7 |
|
8 |
|
9 -try: # Python 2.7+ |
|
10 - from collections import OrderedDict |
|
11 -except ImportError: |
|
12 - from .packages.ordered_dict import OrderedDict |
|
13 -from .packages.six import iterkeys, itervalues, PY3 |
|
14 +from collections import OrderedDict |
|
15 +from six import iterkeys, itervalues, PY3 |
|
16 |
|
17 |
|
18 __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict'] |
|
19 |
|
20 --- urllib3-1.10.4/urllib3/connection.py.orig 2015-05-08 13:10:42.386855243 -0600 |
|
21 +++ urllib3-1.10.4/urllib3/connection.py 2015-05-08 13:11:00.210452150 -0600 |
|
22 @@ -3,7 +3,7 @@ import sys |
|
23 import socket |
|
24 from socket import timeout as SocketTimeout |
|
25 import warnings |
|
26 -from .packages import six |
|
27 +import six |
|
28 |
|
29 try: # Python 3 |
|
30 from http.client import HTTPConnection as _HTTPConnection, HTTPException |
|
31 |
|
32 --- urllib3-1.10.4/urllib3/connectionpool.py.orig 2015-05-08 13:12:22.805384141 -0600 |
|
33 +++ urllib3-1.10.4/urllib3/connectionpool.py 2015-05-08 13:12:36.558475524 -0600 |
|
34 @@ -27,7 +27,7 @@ from .exceptions import ( |
|
35 InsecureRequestWarning, |
|
36 ) |
|
37 from .packages.ssl_match_hostname import CertificateError |
|
38 -from .packages import six |
|
39 +import six |
|
40 from .connection import ( |
|
41 port_by_scheme, |
|
42 DummyConnection, |
|
43 |
|
44 --- urllib3-1.10.4/urllib3/fields.py.orig 2015-05-08 13:17:35.832547496 -0600 |
|
45 +++ urllib3-1.10.4/urllib3/fields.py 2015-05-08 13:17:46.167925955 -0600 |
|
46 @@ -1,7 +1,7 @@ |
|
47 import email.utils |
|
48 import mimetypes |
|
49 |
|
50 -from .packages import six |
|
51 +import six |
|
52 |
|
53 |
|
54 def guess_content_type(filename, default='application/octet-stream'): |
|
55 |
|
56 --- urllib3-1.10.4/urllib3/filepost.py.orig 2015-05-08 13:14:01.703344284 -0600 |
|
57 +++ urllib3-1.10.4/urllib3/filepost.py 2015-05-08 13:14:16.319642917 -0600 |
|
58 @@ -3,8 +3,8 @@ import codecs |
|
59 from uuid import uuid4 |
|
60 from io import BytesIO |
|
61 |
|
62 -from .packages import six |
|
63 -from .packages.six import b |
|
64 +import six |
|
65 +from six import b |
|
66 from .fields import RequestField |
|
67 |
|
68 writer = codecs.lookup('utf-8')[3] |
|
69 |
|
70 --- urllib3-1.10.4/urllib3/response.py.orig 2015-05-08 13:14:46.148251904 -0600 |
|
71 +++ urllib3-1.10.4/urllib3/response.py 2015-05-08 13:14:58.056078256 -0600 |
|
72 @@ -10,7 +10,7 @@ from ._collections import HTTPHeaderDict |
|
73 from .exceptions import ( |
|
74 ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked |
|
75 ) |
|
76 -from .packages.six import string_types as basestring, binary_type, PY3 |
|
77 +from six import string_types as basestring, binary_type, PY3 |
|
78 from .connection import HTTPException, BaseSSLError |
|
79 from .util.response import is_fp_closed |
|
80 |
|
81 --- urllib3-1.10.4/urllib3/util/request.py.orig 2015-05-08 13:15:36.877580798 -0600 |
|
82 +++ urllib3-1.10.4/urllib3/util/request.py 2015-05-08 13:15:43.538499579 -0600 |
|
83 @@ -1,6 +1,6 @@ |
|
84 from base64 import b64encode |
|
85 |
|
86 -from ..packages.six import b |
|
87 +from six import b |
|
88 |
|
89 ACCEPT_ENCODING = 'gzip,deflate' |
|
90 |
|
91 |
|
92 --- urllib3-1.10.4/urllib3/util/retry.py.orig 2015-05-08 13:16:14.384622856 -0600 |
|
93 +++ urllib3-1.10.4/urllib3/util/retry.py 2015-05-08 13:16:22.531096314 -0600 |
|
94 @@ -8,7 +8,7 @@ from ..exceptions import ( |
|
95 ReadTimeoutError, |
|
96 ResponseError, |
|
97 ) |
|
98 -from ..packages import six |
|
99 +import six |
|
100 |
|
101 |
|
102 log = logging.getLogger(__name__) |