Refresh debian/patches/0001-Don-t-use-duplicated-modules.patch

This commit is contained in:
Noah Meyerhans 2021-10-04 09:37:16 -07:00
parent d64d76f623
commit 103b08cbd0

View file

@ -149,31 +149,3 @@ Index: python-botocore/tests/integration/test_glacier.py
import botocore.session
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 @@
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),
Index: python-botocore/tests/unit/test_http_session.py
===================================================================
--- python-botocore.orig/tests/unit/test_http_session.py
+++ python-botocore/tests/unit/test_http_session.py
@@ -4,7 +4,7 @@ from tests import mock, 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