Skip to content

Commit f5ff3b9

Browse files
author
wallisyan
committed
vendored
1 parent 21b374c commit f5ff3b9

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

aliyun-python-sdk-core/alibabacloud/vendored/requests/models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
"""
99

1010
import datetime
11+
import sys
1112

1213
# Import encoding now, to avoid implicit import later.
1314
# Implicit import within threads may cause LookupError when standard library is in a ZIP,
1415
# such as in Embedded Python. See https://github.com/requests/requests/issues/3578.
16+
import encodings.idna
1517

1618
from .packages.urllib3.fields import RequestField
1719
from .packages.urllib3.filepost import encode_multipart_formdata

aliyun-python-sdk-core/alibabacloud/vendored/requests/packages/urllib3/connection.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import warnings
99
from .packages import six
1010
from .packages.six.moves.http_client import HTTPConnection as _HTTPConnection
11+
from .packages.six.moves.http_client import HTTPException # noqa: F401
1112

1213
try: # Compiled with SSL?
1314
import ssl

aliyun-python-sdk-core/alibabacloud/vendored/requests/packages/urllib3/connectionpool.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
if six.PY2:
4747
# Queue is imported for side effects on MS Windows
48-
pass
48+
import Queue as _unused_module_Queue # noqa: F401
4949

5050
xrange = six.moves.xrange
5151

aliyun-python-sdk-core/alibabacloud/vendored/requests/packages/urllib3/contrib/pyopenssl.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
SSL_WRITE_BLOCKSIZE = 16384
101101

102102
orig_util_HAS_SNI = util.HAS_SNI
103-
orig_util_SSLContext = alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext
103+
orig_util_SSLContext = util.ssl_.SSLContext
104104

105105

106106
log = logging.getLogger(__name__)
@@ -111,21 +111,21 @@ def inject_into_urllib3():
111111

112112
_validate_dependencies_met()
113113

114-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext = PyOpenSSLContext
114+
util.ssl_.SSLContext = PyOpenSSLContext
115115
util.HAS_SNI = HAS_SNI
116-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.HAS_SNI = HAS_SNI
116+
util.ssl_.HAS_SNI = HAS_SNI
117117
util.IS_PYOPENSSL = True
118-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.IS_PYOPENSSL = True
118+
util.ssl_.IS_PYOPENSSL = True
119119

120120

121121
def extract_from_urllib3():
122122
'Undo monkey-patching by :func:`inject_into_urllib3`.'
123123

124-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext = orig_util_SSLContext
124+
util.ssl_.SSLContext = orig_util_SSLContext
125125
util.HAS_SNI = orig_util_HAS_SNI
126-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.HAS_SNI = orig_util_HAS_SNI
126+
util.ssl_.HAS_SNI = orig_util_HAS_SNI
127127
util.IS_PYOPENSSL = False
128-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.IS_PYOPENSSL = False
128+
util.ssl_.IS_PYOPENSSL = False
129129

130130

131131
def _validate_dependencies_met():

aliyun-python-sdk-core/alibabacloud/vendored/requests/packages/urllib3/contrib/securetransport.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
HAS_SNI = True
6363

6464
orig_util_HAS_SNI = util.HAS_SNI
65-
orig_util_SSLContext = alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext
65+
orig_util_SSLContext = util.ssl_.SSLContext
6666

6767
# This dictionary is used by the read callback to obtain a handle to the
6868
# calling wrapped socket. This is a pretty silly approach, but for now it'll
@@ -157,22 +157,22 @@ def inject_into_urllib3():
157157
"""
158158
Monkey-patch urllib3 with SecureTransport-backed SSL-support.
159159
"""
160-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext = SecureTransportContext
160+
util.ssl_.SSLContext = SecureTransportContext
161161
util.HAS_SNI = HAS_SNI
162-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.HAS_SNI = HAS_SNI
162+
util.ssl_.HAS_SNI = HAS_SNI
163163
util.IS_SECURETRANSPORT = True
164-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.IS_SECURETRANSPORT = True
164+
util.ssl_.IS_SECURETRANSPORT = True
165165

166166

167167
def extract_from_urllib3():
168168
"""
169169
Undo monkey-patching by :func:`inject_into_urllib3`.
170170
"""
171-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.SSLContext = orig_util_SSLContext
171+
util.ssl_.SSLContext = orig_util_SSLContext
172172
util.HAS_SNI = orig_util_HAS_SNI
173-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.HAS_SNI = orig_util_HAS_SNI
173+
util.ssl_.HAS_SNI = orig_util_HAS_SNI
174174
util.IS_SECURETRANSPORT = False
175-
alibabacloud.vendored.requests.packages.urllib3.util.ssl_.IS_SECURETRANSPORT = False
175+
util.ssl_.IS_SECURETRANSPORT = False
176176

177177

178178
def _read_callback(connection_id, data_buffer, data_length_pointer):
@@ -765,7 +765,7 @@ def load_default_certs(self):
765765

766766
def set_ciphers(self, ciphers):
767767
# For now, we just require the default cipher string.
768-
if ciphers != alibabacloud.vendored.requests.packages.urllib3.util.ssl_.DEFAULT_CIPHERS:
768+
if ciphers != util.ssl_.DEFAULT_CIPHERS:
769769
raise ValueError(
770770
"SecureTransport doesn't support custom cipher strings"
771771
)

aliyun-python-sdk-core/alibabacloud/vendored/requests/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
from .__version__ import __version__
2323
from . import certs
2424
# to_native_string is unused here, but imported here for backwards compatibility
25+
from ._internal_utils import to_native_string
2526
from .compat import parse_http_list as _parse_list_header
2627
from .compat import (
2728
quote, urlparse, bytes, str, OrderedDict, unquote, getproxies,

0 commit comments

Comments
 (0)