Refresh patches

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

@@ -21,8 +21,8 @@ Index: python-botocore/botocore/compat.py
 ===================================================================
 --- python-botocore.orig/botocore/compat.py
 +++ python-botocore/botocore/compat.py
-@@ -22,7 +22,7 @@ import shlex
- import os
+@@ -25,7 +25,7 @@ from collections import OrderedDict
+ from collections.abc import MutableMapping
  from math import floor
  
 -from botocore.vendored import six
@@ -30,28 +30,15 @@ Index: python-botocore/botocore/compat.py
  from botocore.exceptions import MD5UnavailableError
  from dateutil.tz import tzlocal
  from urllib3 import exceptions
-@@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
+@@ -33,7 +33,7 @@ from urllib3 import exceptions
+ logger = logging.getLogger(__name__)
  
  
- if six.PY3:
--    from botocore.vendored.six.moves import http_client
-+    from six.moves import http_client
+-from botocore.vendored.six.moves import http_client
++from six.moves import http_client
  
-     class HTTPHeaders(http_client.HTTPMessage):
-         pass
-Index: python-botocore/botocore/endpoint.py
-===================================================================
---- python-botocore.orig/botocore/endpoint.py
-+++ python-botocore/botocore/endpoint.py
-@@ -17,7 +17,7 @@ import logging
- import time
- import threading
- 
--from botocore.vendored import six
-+import six
- 
- from botocore.awsrequest import create_request_object
- from botocore.exceptions import HTTPClientError
+ class HTTPHeaders(http_client.HTTPMessage):
+     pass
 Index: python-botocore/botocore/exceptions.py
 ===================================================================
 --- python-botocore.orig/botocore/exceptions.py
@@ -59,7 +46,7 @@ Index: 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 __future__ import unicode_literals
+ 
 -from botocore.vendored import requests
 -from botocore.vendored.requests.packages import urllib3
 +import requests
@@ -71,79 +58,90 @@ Index: python-botocore/botocore/httpsession.py
 ===================================================================
 --- python-botocore.orig/botocore/httpsession.py
 +++ python-botocore/botocore/httpsession.py
-@@ -21,7 +21,7 @@ except ImportError:
-     from urllib3.util.ssl_ import SSLContext
- 
- import botocore.awsrequest
+@@ -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
- from botocore.compat import filter_ssl_warnings, urlparse
- from botocore.exceptions import (
-     ConnectionClosedError, EndpointConnectionError, HTTPClientError,
+ 
+ filter_ssl_warnings()
+ logger = logging.getLogger(__name__)
 Index: python-botocore/botocore/utils.py
 ===================================================================
 --- python-botocore.orig/botocore/utils.py
 +++ python-botocore/botocore/utils.py
-@@ -35,7 +35,7 @@ from botocore.compat import (
-     six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE,
-     HAS_CRT
+@@ -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
- from botocore.exceptions import (
-     InvalidExpressionError, ConfigNotFound, InvalidDNSNameError, ClientError,
-     MetadataRetrievalError, EndpointConnectionError, ReadTimeoutError,
+ 
+ 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
-@@ -7,7 +7,7 @@ import time
- 
- from tests import mock
+@@ -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__
-@@ -47,7 +47,7 @@ class _ExampleThread(threading.Thread):
+@@ -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
+         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
-@@ -8,12 +8,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, ClientError, ProxyConnectionError
+@@ -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
  
  
- class TestClientHTTPBehavior(unittest.TestCase):
 Index: python-botocore/tests/integration/test_glacier.py
 ===================================================================
 --- python-botocore.orig/tests/integration/test_glacier.py
 +++ python-botocore/tests/integration/test_glacier.py
-@@ -13,7 +13,7 @@
- from tests import unittest
- 
+@@ -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
- import botocore.session
+ 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,
+ )
+