From 103b08cbd056dfe0b3bee0369f732668ccb39098 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Mon, 4 Oct 2021 09:37:16 -0700 Subject: [PATCH] Refresh debian/patches/0001-Don-t-use-duplicated-modules.patch --- .../0001-Don-t-use-duplicated-modules.patch | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch index 8b717bee..a673819d 100644 --- a/debian/patches/0001-Don-t-use-duplicated-modules.patch +++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch @@ -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