patch refresh
This commit is contained in:
TANIGUCHI Takaki
parent
7b688bebe7
commit
c7c18745f0
|
|
@ -1,59 +1,36 @@
|
|||
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
|
||||
Date: Tue, 24 Nov 2015 20:40:16 +0900
|
||||
Date: Thu, 4 Oct 2018 16:22:43 +0900
|
||||
Subject: Don't use duplicated modules
|
||||
|
||||
fix path
|
||||
---
|
||||
botocore/awsrequest.py | 12 ++++++------
|
||||
botocore/compat.py | 6 +++---
|
||||
botocore/endpoint.py | 14 +++++++-------
|
||||
botocore/exceptions.py | 2 +-
|
||||
botocore/retryhandler.py | 4 ++--
|
||||
botocore/stub.py | 2 +-
|
||||
botocore/utils.py | 2 +-
|
||||
7 files changed, 21 insertions(+), 21 deletions(-)
|
||||
botocore/compat.py | 4 ++--
|
||||
botocore/endpoint.py | 2 +-
|
||||
botocore/exceptions.py | 4 ++--
|
||||
botocore/httpsession.py | 4 ++--
|
||||
botocore/utils.py | 2 +-
|
||||
tests/functional/test_six_threading.py | 4 ++--
|
||||
tests/integration/test_client_http.py | 4 ++--
|
||||
tests/integration/test_glacier.py | 2 +-
|
||||
tests/integration/test_s3.py | 2 +-
|
||||
tests/unit/test_endpoint.py | 2 +-
|
||||
tests/unit/test_http_client_exception_mapping.py | 4 ++--
|
||||
tests/unit/test_http_session.py | 2 +-
|
||||
12 files changed, 18 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
|
||||
index c26ebc0..f1083af 100644
|
||||
--- a/botocore/awsrequest.py
|
||||
+++ b/botocore/awsrequest.py
|
||||
@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit,\
|
||||
urlparse
|
||||
from botocore.exceptions import UnseekableStreamError
|
||||
from botocore.utils import percent_encode_sequence
|
||||
-from botocore.vendored.requests import models
|
||||
-from botocore.vendored.requests.sessions import REDIRECT_STATI
|
||||
-from botocore.vendored.requests.packages.urllib3.connection import \
|
||||
+from requests import models
|
||||
+from requests.sessions import REDIRECT_STATI
|
||||
+from urllib3.connection import \
|
||||
VerifiedHTTPSConnection
|
||||
-from botocore.vendored.requests.packages.urllib3.connection import \
|
||||
+from urllib3.connection import \
|
||||
HTTPConnection
|
||||
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
|
||||
+from urllib3.connectionpool import \
|
||||
HTTPConnectionPool
|
||||
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
|
||||
+from urllib3.connectionpool import \
|
||||
HTTPSConnectionPool
|
||||
|
||||
|
||||
diff --git a/botocore/compat.py b/botocore/compat.py
|
||||
index edf4df4..86d8d3d 100644
|
||||
index 47e1c81..86d8d3d 100644
|
||||
--- a/botocore/compat.py
|
||||
+++ b/botocore/compat.py
|
||||
@@ -21,15 +21,15 @@ import logging
|
||||
@@ -21,7 +21,7 @@ import logging
|
||||
import shlex
|
||||
from math import floor
|
||||
|
||||
-from botocore.vendored import six
|
||||
+import six
|
||||
from botocore.exceptions import MD5UnavailableError
|
||||
-from botocore.vendored.requests.packages.urllib3 import exceptions
|
||||
+from urllib3 import exceptions
|
||||
from urllib3 import exceptions
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
if six.PY3:
|
||||
|
|
@ -63,95 +40,166 @@ index edf4df4..86d8d3d 100644
|
|||
class HTTPHeaders(http_client.HTTPMessage):
|
||||
pass
|
||||
diff --git a/botocore/endpoint.py b/botocore/endpoint.py
|
||||
index ec33517..60497b9 100644
|
||||
index efa6be0..6b0599b 100644
|
||||
--- a/botocore/endpoint.py
|
||||
+++ b/botocore/endpoint.py
|
||||
@@ -17,11 +17,11 @@ import logging
|
||||
@@ -17,7 +17,7 @@ import logging
|
||||
import time
|
||||
import threading
|
||||
|
||||
-from botocore.vendored.requests.adapters import HTTPAdapter
|
||||
-from botocore.vendored.requests.sessions import Session
|
||||
-from botocore.vendored.requests.utils import get_environ_proxies
|
||||
-from botocore.vendored.requests.exceptions import ConnectionError
|
||||
-from botocore.vendored import six
|
||||
+from requests.adapters import HTTPAdapter
|
||||
+from requests.sessions import Session
|
||||
+from requests.utils import get_environ_proxies
|
||||
+from requests.exceptions import ConnectionError
|
||||
+import six
|
||||
|
||||
from botocore.awsrequest import create_request_object
|
||||
from botocore.exceptions import UnknownEndpointError
|
||||
@@ -42,7 +42,7 @@ MAX_POOL_CONNECTIONS = 10
|
||||
filter_ssl_warnings()
|
||||
|
||||
try:
|
||||
- from botocore.vendored.requests.packages.urllib3.contrib import pyopenssl
|
||||
+ from urllib3.contrib import pyopenssl
|
||||
pyopenssl.extract_from_urllib3()
|
||||
except ImportError:
|
||||
pass
|
||||
@@ -54,7 +54,7 @@ def convert_to_response_dict(http_response, operation_model):
|
||||
This converts the requests library's HTTP response object to
|
||||
a dictionary.
|
||||
|
||||
- :type http_response: botocore.vendored.requests.model.Response
|
||||
+ :type http_response: requests.model.Response
|
||||
:param http_response: The HTTP response from an AWS service request.
|
||||
|
||||
:rtype: dict
|
||||
from botocore.exceptions import HTTPClientError
|
||||
diff --git a/botocore/exceptions.py b/botocore/exceptions.py
|
||||
index b5eb012..23bad58 100644
|
||||
index 36f5867..129ff4d 100644
|
||||
--- a/botocore/exceptions.py
|
||||
+++ b/botocore/exceptions.py
|
||||
@@ -12,7 +12,7 @@
|
||||
@@ -12,8 +12,8 @@
|
||||
# ANY KIND, either express or implied. See the License for the specific
|
||||
# language governing permissions and limitations under the License.
|
||||
from __future__ import unicode_literals
|
||||
-from botocore.vendored.requests.exceptions import ConnectionError
|
||||
+from requests.exceptions import ConnectionError
|
||||
-from botocore.vendored import requests
|
||||
-from botocore.vendored.requests.packages import urllib3
|
||||
+import requests
|
||||
+from requests.packages import urllib3
|
||||
|
||||
|
||||
class BotoCoreError(Exception):
|
||||
diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
|
||||
index 09b59e5..58913ec 100644
|
||||
--- a/botocore/retryhandler.py
|
||||
+++ b/botocore/retryhandler.py
|
||||
@@ -17,8 +17,8 @@ import functools
|
||||
import logging
|
||||
from binascii import crc32
|
||||
diff --git a/botocore/httpsession.py b/botocore/httpsession.py
|
||||
index 28ad866..9fe081c 100644
|
||||
--- a/botocore/httpsession.py
|
||||
+++ b/botocore/httpsession.py
|
||||
@@ -18,8 +18,8 @@ except ImportError:
|
||||
from urllib3.util.ssl_ import SSLContext
|
||||
|
||||
-from botocore.vendored.requests import ConnectionError, Timeout
|
||||
-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
|
||||
+from requests import ConnectionError, Timeout
|
||||
+from urllib3.exceptions import ClosedPoolError
|
||||
|
||||
from botocore.exceptions import ChecksumError, EndpointConnectionError
|
||||
|
||||
diff --git a/botocore/stub.py b/botocore/stub.py
|
||||
index 312a6ce..7a23aa7 100644
|
||||
--- a/botocore/stub.py
|
||||
+++ b/botocore/stub.py
|
||||
@@ -17,7 +17,7 @@ from pprint import pformat
|
||||
from botocore.validate import validate_parameters
|
||||
from botocore.exceptions import ParamValidationError, \
|
||||
StubResponseError, StubAssertionError, UnStubbedResponseError
|
||||
-from botocore.vendored.requests.models import Response
|
||||
+from requests.models import Response
|
||||
|
||||
|
||||
class _ANY(object):
|
||||
import botocore.awsrequest
|
||||
-from botocore.vendored import six
|
||||
-from botocore.vendored.six.moves.urllib_parse import unquote
|
||||
+import six
|
||||
+from six.moves.urllib_parse import unquote
|
||||
from botocore.compat import filter_ssl_warnings, urlparse
|
||||
from botocore.exceptions import (
|
||||
ConnectionClosedError, EndpointConnectionError, HTTPClientError,
|
||||
diff --git a/botocore/utils.py b/botocore/utils.py
|
||||
index 0de8e57..bb1914b 100644
|
||||
index 74b4107..1557ded 100644
|
||||
--- a/botocore/utils.py
|
||||
+++ b/botocore/utils.py
|
||||
@@ -29,7 +29,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
|
||||
from botocore.exceptions import InvalidDNSNameError, ClientError
|
||||
from botocore.exceptions import MetadataRetrievalError
|
||||
@@ -31,7 +31,7 @@ import botocore.awsrequest
|
||||
import botocore.httpsession
|
||||
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
|
||||
-from botocore.vendored import requests
|
||||
from botocore.compat import OrderedDict, six, urlparse
|
||||
-from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
|
||||
+from six.moves.urllib.request import getproxies, proxy_bypass
|
||||
from botocore.exceptions import (
|
||||
InvalidExpressionError, ConfigNotFound, InvalidDNSNameError, ClientError,
|
||||
MetadataRetrievalError, EndpointConnectionError, ReadTimeoutError,
|
||||
diff --git a/tests/functional/test_six_threading.py b/tests/functional/test_six_threading.py
|
||||
index 5ef9bc3..268304a 100644
|
||||
--- a/tests/functional/test_six_threading.py
|
||||
+++ b/tests/functional/test_six_threading.py
|
||||
@@ -6,7 +6,7 @@ import sys
|
||||
import threading
|
||||
import time
|
||||
|
||||
-from botocore.vendored import six
|
||||
+import six
|
||||
|
||||
|
||||
_original_setattr = six.moves.__class__.__setattr__
|
||||
@@ -51,7 +51,7 @@ class _ExampleThread(threading.Thread):
|
||||
|
||||
def test_six_thread_safety():
|
||||
_reload_six()
|
||||
- with patch('botocore.vendored.six.moves.__class__.__setattr__',
|
||||
+ with patch('six.moves.__class__.__setattr__',
|
||||
wraps=_wrapped_setattr):
|
||||
threads = []
|
||||
for i in range(2):
|
||||
diff --git a/tests/integration/test_client_http.py b/tests/integration/test_client_http.py
|
||||
index e5c96f7..5b39e22 100644
|
||||
--- a/tests/integration/test_client_http.py
|
||||
+++ b/tests/integration/test_client_http.py
|
||||
@@ -7,12 +7,12 @@ from contextlib import contextmanager
|
||||
|
||||
import botocore.session
|
||||
from botocore.config import Config
|
||||
-from botocore.vendored.six.moves import BaseHTTPServer, socketserver
|
||||
+from six.moves import BaseHTTPServer, socketserver
|
||||
from botocore.exceptions import (
|
||||
ConnectTimeoutError, ReadTimeoutError, EndpointConnectionError,
|
||||
ConnectionClosedError,
|
||||
)
|
||||
-from botocore.vendored.requests import exceptions as requests_exceptions
|
||||
+from requests import exceptions as requests_exceptions
|
||||
|
||||
|
||||
class TestClientHTTPBehavior(unittest.TestCase):
|
||||
diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py
|
||||
index 23a7f34..96cedf0 100644
|
||||
--- a/tests/integration/test_glacier.py
|
||||
+++ b/tests/integration/test_glacier.py
|
||||
@@ -13,7 +13,7 @@
|
||||
from tests import unittest
|
||||
|
||||
from botocore.exceptions import ClientError
|
||||
-from botocore.vendored import six
|
||||
+import six
|
||||
import botocore.session
|
||||
|
||||
|
||||
diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
|
||||
index 1a007aa..e5e5ae3 100644
|
||||
--- a/tests/integration/test_s3.py
|
||||
+++ b/tests/integration/test_s3.py
|
||||
@@ -31,7 +31,7 @@ from botocore.compat import six, zip_longest
|
||||
import botocore.session
|
||||
import botocore.auth
|
||||
import botocore.credentials
|
||||
-import botocore.vendored.requests as requests
|
||||
+import requests
|
||||
from botocore.compat import OrderedDict, six
|
||||
from botocore.config import Config
|
||||
from botocore.exceptions import ClientError
|
||||
|
||||
diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
|
||||
index 0cc8ab1..ffcce97 100644
|
||||
--- a/tests/unit/test_endpoint.py
|
||||
+++ b/tests/unit/test_endpoint.py
|
||||
@@ -14,7 +14,7 @@
|
||||
from tests import unittest
|
||||
|
||||
from mock import Mock, patch, sentinel
|
||||
-from botocore.vendored.requests import ConnectionError
|
||||
+from requests import ConnectionError
|
||||
|
||||
from botocore.compat import six
|
||||
from botocore.awsrequest import AWSRequest
|
||||
diff --git a/tests/unit/test_http_client_exception_mapping.py b/tests/unit/test_http_client_exception_mapping.py
|
||||
index 9eee38c..7dc759a 100644
|
||||
--- a/tests/unit/test_http_client_exception_mapping.py
|
||||
+++ b/tests/unit/test_http_client_exception_mapping.py
|
||||
@@ -1,8 +1,8 @@
|
||||
from nose.tools import assert_raises
|
||||
|
||||
from botocore import exceptions as botocore_exceptions
|
||||
-from botocore.vendored.requests import exceptions as requests_exceptions
|
||||
-from botocore.vendored.requests.packages.urllib3 import exceptions as urllib3_exceptions
|
||||
+from requests import exceptions as requests_exceptions
|
||||
+from requests.packages.urllib3 import exceptions as urllib3_exceptions
|
||||
|
||||
EXCEPTION_MAPPING = [
|
||||
(botocore_exceptions.ReadTimeoutError, requests_exceptions.ReadTimeout),
|
||||
diff --git a/tests/unit/test_http_session.py b/tests/unit/test_http_session.py
|
||||
index 5568a68..5492c73 100644
|
||||
--- a/tests/unit/test_http_session.py
|
||||
+++ b/tests/unit/test_http_session.py
|
||||
@@ -3,7 +3,7 @@ from tests import unittest
|
||||
from nose.tools import raises
|
||||
from urllib3.exceptions import NewConnectionError, ProtocolError
|
||||
|
||||
-from botocore.vendored import six
|
||||
+import six
|
||||
from botocore.awsrequest import AWSRequest
|
||||
from botocore.awsrequest import AWSHTTPConnectionPool, AWSHTTPSConnectionPool
|
||||
from botocore.httpsession import get_cert_path
|
||||
|
|
|
|||
|
|
@ -1,163 +0,0 @@
|
|||
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
|
||||
Date: Tue, 24 Nov 2015 21:34:20 +0900
|
||||
Subject: Don't use duplicated modules (in tests)
|
||||
|
||||
---
|
||||
tests/integration/test_glacier.py | 2 +-
|
||||
tests/integration/test_s3.py | 8 ++++----
|
||||
tests/integration/test_smoke.py | 6 +++---
|
||||
tests/unit/auth/test_signers.py | 2 +-
|
||||
tests/unit/test_awsrequest.py | 2 +-
|
||||
tests/unit/test_endpoint.py | 2 +-
|
||||
tests/unit/test_response.py | 2 +-
|
||||
tests/unit/test_retryhandler.py | 4 ++--
|
||||
tests/unit/test_utils.py | 2 +-
|
||||
9 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/tests/integration/test_glacier.py b/tests/integration/test_glacier.py
|
||||
index 23a7f34..96cedf0 100644
|
||||
--- a/tests/integration/test_glacier.py
|
||||
+++ b/tests/integration/test_glacier.py
|
||||
@@ -13,7 +13,7 @@
|
||||
from tests import unittest
|
||||
|
||||
from botocore.exceptions import ClientError
|
||||
-from botocore.vendored import six
|
||||
+import six
|
||||
import botocore.session
|
||||
|
||||
|
||||
diff --git a/tests/integration/test_s3.py b/tests/integration/test_s3.py
|
||||
index 1f07ef0..84962ed 100644
|
||||
--- a/tests/integration/test_s3.py
|
||||
+++ b/tests/integration/test_s3.py
|
||||
@@ -25,13 +25,13 @@ from contextlib import closing
|
||||
|
||||
from nose.plugins.attrib import attr
|
||||
|
||||
-from botocore.vendored.requests import adapters
|
||||
-from botocore.vendored.requests.exceptions import ConnectionError
|
||||
+from requests import adapters
|
||||
+from requests.exceptions import ConnectionError
|
||||
from botocore.compat import six, zip_longest
|
||||
import botocore.session
|
||||
import botocore.auth
|
||||
import botocore.credentials
|
||||
-import botocore.vendored.requests as requests
|
||||
+import requests
|
||||
from botocore.config import Config
|
||||
from botocore.exceptions import ClientError
|
||||
|
||||
@@ -823,7 +823,7 @@ class TestS3SigV4Client(BaseS3ClientTest):
|
||||
raise ConnectionError("Simulated ConnectionError raised.")
|
||||
else:
|
||||
return original_send(self, *args, **kwargs)
|
||||
- with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send',
|
||||
+ with mock.patch('requests.adapters.HTTPAdapter.send',
|
||||
mock_http_adapter_send):
|
||||
response = self.client.put_object(Bucket=self.bucket_name,
|
||||
Key='foo.txt', Body=body)
|
||||
diff --git a/tests/integration/test_smoke.py b/tests/integration/test_smoke.py
|
||||
index 76bcded..85ef5d0 100644
|
||||
--- a/tests/integration/test_smoke.py
|
||||
+++ b/tests/integration/test_smoke.py
|
||||
@@ -19,8 +19,8 @@ from nose.tools import assert_equal, assert_true
|
||||
from botocore import xform_name
|
||||
import botocore.session
|
||||
from botocore.client import ClientError
|
||||
-from botocore.vendored.requests import adapters
|
||||
-from botocore.vendored.requests.exceptions import ConnectionError
|
||||
+from requests import adapters
|
||||
+from requests.exceptions import ConnectionError
|
||||
|
||||
|
||||
# Mapping of service -> api calls to try.
|
||||
@@ -292,7 +292,7 @@ def _make_client_call_with_errors(client, operation_name, kwargs):
|
||||
raise ConnectionError("Simulated ConnectionError raised.")
|
||||
else:
|
||||
return original_send(self, *args, **kwargs)
|
||||
- with mock.patch('botocore.vendored.requests.adapters.HTTPAdapter.send',
|
||||
+ with mock.patch('requests.adapters.HTTPAdapter.send',
|
||||
mock_http_adapter_send):
|
||||
try:
|
||||
response = operation(**kwargs)
|
||||
diff --git a/tests/unit/auth/test_signers.py b/tests/unit/auth/test_signers.py
|
||||
index d3dfab9..8f7b28f 100644
|
||||
--- a/tests/unit/auth/test_signers.py
|
||||
+++ b/tests/unit/auth/test_signers.py
|
||||
@@ -24,7 +24,7 @@ import botocore.auth
|
||||
import botocore.credentials
|
||||
from botocore.compat import HTTPHeaders, urlsplit, parse_qs, six
|
||||
from botocore.awsrequest import AWSRequest
|
||||
-from botocore.vendored.requests.models import Request
|
||||
+from requests.models import Request
|
||||
|
||||
|
||||
class BaseTestWithFixedDate(unittest.TestCase):
|
||||
diff --git a/tests/unit/test_awsrequest.py b/tests/unit/test_awsrequest.py
|
||||
index d37aa24..e43d627 100644
|
||||
--- a/tests/unit/test_awsrequest.py
|
||||
+++ b/tests/unit/test_awsrequest.py
|
||||
@@ -418,7 +418,7 @@ class TestAWSHTTPConnection(unittest.TestCase):
|
||||
conn.sock = s
|
||||
# Test that the standard library method was used by patching out
|
||||
# the ``_tunnel`` method and seeing if the std lib method was called.
|
||||
- with patch('botocore.vendored.requests.packages.urllib3.connection.'
|
||||
+ with patch('requests.packages.urllib3.connection.'
|
||||
'HTTPConnection._tunnel') as mock_tunnel:
|
||||
conn._tunnel()
|
||||
self.assertTrue(mock_tunnel.called)
|
||||
diff --git a/tests/unit/test_endpoint.py b/tests/unit/test_endpoint.py
|
||||
index fff84b0..2f266a4 100644
|
||||
--- a/tests/unit/test_endpoint.py
|
||||
+++ b/tests/unit/test_endpoint.py
|
||||
@@ -14,7 +14,7 @@
|
||||
from tests import unittest
|
||||
|
||||
from mock import Mock, patch, sentinel
|
||||
-from botocore.vendored.requests import ConnectionError
|
||||
+from requests import ConnectionError
|
||||
|
||||
from botocore.compat import six
|
||||
from botocore.awsrequest import AWSRequest
|
||||
diff --git a/tests/unit/test_response.py b/tests/unit/test_response.py
|
||||
index 39daf58..2b8787d 100644
|
||||
--- a/tests/unit/test_response.py
|
||||
+++ b/tests/unit/test_response.py
|
||||
@@ -20,7 +20,7 @@ import botocore
|
||||
from botocore import response
|
||||
from botocore.compat import six
|
||||
from botocore.exceptions import IncompleteReadError
|
||||
-from botocore.vendored.requests.models import Response, Request
|
||||
+from requests.models import Response, Request
|
||||
|
||||
XMLBODY1 = (b'<?xml version="1.0" encoding="UTF-8"?><Error>'
|
||||
b'<Code>AccessDenied</Code>'
|
||||
diff --git a/tests/unit/test_retryhandler.py b/tests/unit/test_retryhandler.py
|
||||
index 3f31a69..a6f05b8 100644
|
||||
--- a/tests/unit/test_retryhandler.py
|
||||
+++ b/tests/unit/test_retryhandler.py
|
||||
@@ -16,8 +16,8 @@
|
||||
from tests import unittest
|
||||
|
||||
import mock
|
||||
-from botocore.vendored.requests import ConnectionError, Timeout
|
||||
-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
|
||||
+from requests import ConnectionError, Timeout
|
||||
+from urllib3.exceptions import ClosedPoolError
|
||||
|
||||
from botocore import retryhandler
|
||||
from botocore.exceptions import ChecksumError
|
||||
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
|
||||
index 054aee4..5842674 100644
|
||||
--- a/tests/unit/test_utils.py
|
||||
+++ b/tests/unit/test_utils.py
|
||||
@@ -25,7 +25,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
|
||||
from botocore.exceptions import ClientError
|
||||
from botocore.exceptions import InvalidDNSNameError, MetadataRetrievalError
|
||||
from botocore.model import ServiceModel
|
||||
-from botocore.vendored import requests
|
||||
+import requests
|
||||
from botocore.utils import is_json_value_header
|
||||
from botocore.utils import remove_dot_segments
|
||||
from botocore.utils import normalize_url_path
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
|
||||
Date: Thu, 24 Aug 2017 11:40:35 +0900
|
||||
Subject: add ssl_context attribute
|
||||
|
||||
---
|
||||
botocore/awsrequest.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
|
||||
index f1083af..0d1db69 100644
|
||||
--- a/botocore/awsrequest.py
|
||||
+++ b/botocore/awsrequest.py
|
||||
@@ -250,6 +250,7 @@ class AWSHTTPConnection(HTTPConnection):
|
||||
|
||||
|
||||
class AWSHTTPSConnection(VerifiedHTTPSConnection):
|
||||
+ ssl_context = None
|
||||
pass
|
||||
|
||||
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
|
@ -1,3 +1 @@
|
|||
0001-Don-t-use-duplicated-modules.patch
|
||||
0002-Don-t-use-duplicated-modules-in-tests.patch
|
||||
0003-add-ssl_context-attribute.patch
|
||||
|
|
|
|||
Loading…
Reference in a new issue