From 279b5f5b7455bae89efe6de1eee6f5f738dd1e77 Mon Sep 17 00:00:00 2001
From: Noah Meyerhans <noahm@debian.org>
Date: Wed, 22 Sep 2021 14:05:08 -0700
Subject: [PATCH] refresh patches

---
 .../0001-Don-t-use-duplicated-modules.patch   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0001-Don-t-use-duplicated-modules.patch b/debian/patches/0001-Don-t-use-duplicated-modules.patch
index df7d00c0..8b717bee 100644
--- a/debian/patches/0001-Don-t-use-duplicated-modules.patch
+++ b/debian/patches/0001-Don-t-use-duplicated-modules.patch
@@ -71,7 +71,7 @@ Index: python-botocore/botocore/httpsession.py
 ===================================================================
 --- python-botocore.orig/botocore/httpsession.py
 +++ python-botocore/botocore/httpsession.py
-@@ -20,8 +20,8 @@ except ImportError:
+@@ -21,8 +21,8 @@ except ImportError:
      from urllib3.util.ssl_ import SSLContext
  
  import botocore.awsrequest
@@ -86,9 +86,9 @@ 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 (
-         json, quote, zip_longest, urlsplit, urlunsplit, OrderedDict,
-         six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE
+@@ -36,7 +36,7 @@ from botocore.compat import (
+         six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE,
+         HAS_CRT
  )
 -from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
 +from six.moves.urllib.request import getproxies, proxy_bypass
@@ -99,29 +99,29 @@ 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
-@@ -6,7 +6,7 @@ import sys
- import threading
- import time
+@@ -7,7 +7,7 @@ import time
+ 
+ from tests import mock
  
 -from botocore.vendored import six
 +import six
  
  
  _original_setattr = six.moves.__class__.__setattr__
-@@ -48,7 +48,7 @@ class _ExampleThread(threading.Thread):
- 
+@@ -50,7 +50,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):
+     with mock.patch(
+-        'botocore.vendored.six.moves.__class__.__setattr__',
++        'six.moves.__class__.__setattr__',
+         wraps=_wrapped_setattr
+     ):
          threads = []
-         for i in range(2):
 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
-@@ -7,12 +7,12 @@ from contextlib import contextmanager
+@@ -8,12 +8,12 @@ from contextlib import contextmanager
  
  import botocore.session
  from botocore.config import Config
@@ -129,7 +129,7 @@ Index: python-botocore/tests/integration/test_client_http.py
 +from six.moves import BaseHTTPServer, socketserver
  from botocore.exceptions import (
      ConnectTimeoutError, ReadTimeoutError, EndpointConnectionError,
-     ConnectionClosedError,
+     ConnectionClosedError, ClientError, ProxyConnectionError
  )
 -from botocore.vendored.requests import exceptions as requests_exceptions
 +from requests import exceptions as requests_exceptions
@@ -168,7 +168,7 @@ 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
-@@ -5,7 +5,7 @@ from tests import unittest
+@@ -4,7 +4,7 @@ from tests import mock, unittest
  from nose.tools import raises
  from urllib3.exceptions import NewConnectionError, ProtocolError