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
|
--- contrib/python/botocore/py3/botocore/compat.py (index)
+++ contrib/python/botocore/py3/botocore/compat.py (working tree)
@@ -22,7 +22,7 @@ import shlex
import os
from math import floor
-from botocore.vendored import six
+import six
from botocore.exceptions import MD5UnavailableError
from dateutil.tz import tzlocal
from urllib3 import exceptions
@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
if six.PY3:
- from botocore.vendored.six.moves import http_client
+ from six.moves import http_client
class HTTPHeaders(http_client.HTTPMessage):
pass
--- contrib/python/botocore/py3/botocore/endpoint.py (index)
+++ contrib/python/botocore/py3/botocore/endpoint.py (working tree)
@@ -32,7 +32,7 @@ import logging
is_valid_endpoint_url,
is_valid_ipv6_endpoint_url,
)
-from botocore.vendored import six
+from botocore.compat import six
logger = logging.getLogger(__name__)
history_recorder = get_global_history_recorder()
--- contrib/python/botocore/py3/botocore/httpsession.py (index)
+++ contrib/python/botocore/py3/botocore/httpsession.py (working tree)
@@ -47,7 +47,7 @@ except ImportError:
ReadTimeoutError,
SSLError,
)
-from botocore.vendored.six.moves.urllib_parse import unquote
+from six.moves.urllib_parse import unquote
filter_ssl_warnings()
logger = logging.getLogger(__name__)
--- contrib/python/botocore/py3/botocore/utils.py (index)
+++ contrib/python/botocore/py3/botocore/utils.py (working tree)
@@ -70,7 +70,7 @@ from botocore.compat import (
UnsupportedS3ControlArnError,
UnsupportedS3ControlConfigurationError,
)
-from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
+from six.moves.urllib.request import getproxies, proxy_bypass
logger = logging.getLogger(__name__)
DEFAULT_METADATA_SERVICE_TIMEOUT = 1
|
