dprevot/python-botocore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refresh patch 0001-Don-t-use-duplicated-modules.patch

Browse source
This commit is contained in:
Noah Meyerhans 2021-11-03 10:21:38 -07:00
parent 0e3d1b1722
commit 673aa9eaad
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/patches/0001-Don-t-use-duplicated-modules.patch vendored
View file

@ -71,13 +71,11 @@ Index: python-botocore/botocore/httpsession.py
===================================================================
--- python-botocore.orig/botocore/httpsession.py
+++ python-botocore/botocore/httpsession.py
@@ -21,8 +21,8 @@ except ImportError:
@@ -21,7 +21,7 @@ except ImportError:
from urllib3.util.ssl_ import SSLContext
import botocore.awsrequest
-from botocore.vendored import six
-from botocore.vendored.six.moves.urllib_parse import unquote
+import six
+from six.moves.urllib_parse import unquote
from botocore.compat import filter_ssl_warnings, urlparse
from botocore.exceptions import (
@ -86,9 +84,9 @@ Index: python-botocore/botocore/utils.py
===================================================================
--- python-botocore.orig/botocore/utils.py
+++ python-botocore/botocore/utils.py
@@ -36,7 +36,7 @@ from botocore.compat import (
six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE,
HAS_CRT
@@ -35,7 +35,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
@ -108,7 +106,7 @@ Index: python-botocore/tests/functional/test_six_threading.py
_original_setattr = six.moves.__class__.__setattr__
@@ -50,7 +50,7 @@ class _ExampleThread(threading.Thread):
@@ -47,7 +47,7 @@ class _ExampleThread(threading.Thread):
def test_six_thread_safety():
_reload_six()
with mock.patch(