Refresh patch 0001-Don-t-use-duplicated-modules.patch
This commit is contained in:
parent
0e3d1b1722
commit
673aa9eaad
|
@ -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,7 +84,7 @@ 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 (
|
||||
@@ -35,7 +35,7 @@ from botocore.compat import (
|
||||
six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE,
|
||||
HAS_CRT
|
||||
)
|
||||
|
@ -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(
|
||||
|
|
Loading…
Reference in a new issue