148 lines
5.6 KiB
Diff
148 lines
5.6 KiB
Diff
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
|
|
Date: Thu, 4 Oct 2018 16:22:43 +0900
|
|
Subject: Don't use duplicated modules
|
|
|
|
---
|
|
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(-)
|
|
|
|
Index: python-botocore/botocore/compat.py
|
|
===================================================================
|
|
--- python-botocore.orig/botocore/compat.py
|
|
+++ python-botocore/botocore/compat.py
|
|
@@ -25,7 +25,7 @@ from collections import OrderedDict
|
|
from collections.abc import MutableMapping
|
|
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
|
|
@@ -33,7 +33,7 @@ from urllib3 import exceptions
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
-from botocore.vendored.six.moves import http_client
|
|
+from six.moves import http_client
|
|
|
|
class HTTPHeaders(http_client.HTTPMessage):
|
|
pass
|
|
Index: python-botocore/botocore/exceptions.py
|
|
===================================================================
|
|
--- python-botocore.orig/botocore/exceptions.py
|
|
+++ python-botocore/botocore/exceptions.py
|
|
@@ -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 botocore.vendored import requests
|
|
-from botocore.vendored.requests.packages import urllib3
|
|
+import requests
|
|
+from requests.packages import urllib3
|
|
|
|
|
|
def _exception_from_packed_args(exception_cls, args=None, kwargs=None):
|
|
Index: python-botocore/botocore/httpsession.py
|
|
===================================================================
|
|
--- python-botocore.orig/botocore/httpsession.py
|
|
+++ python-botocore/botocore/httpsession.py
|
|
@@ -59,7 +59,7 @@ from botocore.exceptions import (
|
|
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__)
|
|
Index: python-botocore/botocore/utils.py
|
|
===================================================================
|
|
--- python-botocore.orig/botocore/utils.py
|
|
+++ python-botocore/botocore/utils.py
|
|
@@ -81,7 +81,7 @@ from botocore.exceptions 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
|
|
Index: python-botocore/tests/functional/test_six_threading.py
|
|
===================================================================
|
|
--- python-botocore.orig/tests/functional/test_six_threading.py
|
|
+++ python-botocore/tests/functional/test_six_threading.py
|
|
@@ -5,7 +5,7 @@ import sys
|
|
import threading
|
|
import time
|
|
|
|
-from botocore.vendored import six
|
|
+import six
|
|
from tests import mock
|
|
|
|
_original_setattr = six.moves.__class__.__setattr__
|
|
@@ -46,7 +46,7 @@ class _ExampleThread(threading.Thread):
|
|
def test_six_thread_safety():
|
|
_reload_six()
|
|
with mock.patch(
|
|
- 'botocore.vendored.six.moves.__class__.__setattr__',
|
|
+ 'six.moves.__class__.__setattr__',
|
|
wraps=_wrapped_setattr,
|
|
):
|
|
threads = []
|
|
Index: python-botocore/tests/integration/test_client_http.py
|
|
===================================================================
|
|
--- python-botocore.orig/tests/integration/test_client_http.py
|
|
+++ python-botocore/tests/integration/test_client_http.py
|
|
@@ -14,8 +14,8 @@ from botocore.exceptions import (
|
|
ProxyConnectionError,
|
|
ReadTimeoutError,
|
|
)
|
|
-from botocore.vendored.requests import exceptions as requests_exceptions
|
|
-from botocore.vendored.six.moves import BaseHTTPServer, socketserver
|
|
+from requests import exceptions as requests_exceptions
|
|
+from six.moves import BaseHTTPServer, socketserver
|
|
from tests import mock, unittest
|
|
|
|
|
|
Index: python-botocore/tests/integration/test_glacier.py
|
|
===================================================================
|
|
--- python-botocore.orig/tests/integration/test_glacier.py
|
|
+++ python-botocore/tests/integration/test_glacier.py
|
|
@@ -12,7 +12,7 @@
|
|
# language governing permissions and limitations under the License.
|
|
import botocore.session
|
|
from botocore.exceptions import ClientError
|
|
-from botocore.vendored import six
|
|
+import six
|
|
from tests import unittest
|
|
|
|
|
|
Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
|
|
===================================================================
|
|
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py
|
|
+++ python-botocore/tests/unit/test_http_client_exception_mapping.py
|
|
@@ -1,8 +1,8 @@
|
|
import pytest
|
|
|
|
from botocore import exceptions as botocore_exceptions
|
|
-from botocore.vendored.requests import exceptions as requests_exceptions
|
|
-from botocore.vendored.requests.packages.urllib3 import (
|
|
+from requests import exceptions as requests_exceptions
|
|
+from requests.packages.urllib3 import (
|
|
exceptions as urllib3_exceptions,
|
|
)
|
|
|