Refresh patch 0001-Don-t-use-duplicated-modules.patch
This commit is contained in:
parent
0d9d27ac0e
commit
2739114dc1
|
@ -21,7 +21,7 @@ Index: python-botocore/botocore/compat.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- python-botocore.orig/botocore/compat.py
|
--- python-botocore.orig/botocore/compat.py
|
||||||
+++ python-botocore/botocore/compat.py
|
+++ python-botocore/botocore/compat.py
|
||||||
@@ -25,7 +25,7 @@ from collections import OrderedDict
|
@@ -26,7 +26,7 @@ from collections import OrderedDict
|
||||||
from collections.abc import MutableMapping
|
from collections.abc import MutableMapping
|
||||||
from math import floor
|
from math import floor
|
||||||
|
|
||||||
|
@ -30,15 +30,6 @@ Index: python-botocore/botocore/compat.py
|
||||||
from botocore.exceptions import MD5UnavailableError
|
from botocore.exceptions import MD5UnavailableError
|
||||||
from dateutil.tz import tzlocal
|
from dateutil.tz import tzlocal
|
||||||
from urllib3 import exceptions
|
from urllib3 import exceptions
|
||||||
@@ -33,7 +33,7 @@ from urllib3 import exceptions
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
|
|
||||||
-from botocore.vendored.six.moves import http_client
|
|
||||||
+from six.moves import http_client
|
|
||||||
|
|
||||||
class HTTPHeaders(http_client.HTTPMessage):
|
|
||||||
pass
|
|
||||||
Index: python-botocore/botocore/exceptions.py
|
Index: python-botocore/botocore/exceptions.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- python-botocore.orig/botocore/exceptions.py
|
--- python-botocore.orig/botocore/exceptions.py
|
||||||
|
@ -54,32 +45,6 @@ Index: python-botocore/botocore/exceptions.py
|
||||||
|
|
||||||
|
|
||||||
def _exception_from_packed_args(exception_cls, args=None, kwargs=None):
|
def _exception_from_packed_args(exception_cls, args=None, kwargs=None):
|
||||||
Index: python-botocore/botocore/httpsession.py
|
|
||||||
===================================================================
|
|
||||||
--- python-botocore.orig/botocore/httpsession.py
|
|
||||||
+++ python-botocore/botocore/httpsession.py
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
filter_ssl_warnings()
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
Index: python-botocore/botocore/utils.py
|
|
||||||
===================================================================
|
|
||||||
--- python-botocore.orig/botocore/utils.py
|
|
||||||
+++ python-botocore/botocore/utils.py
|
|
||||||
@@ -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
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
DEFAULT_METADATA_SERVICE_TIMEOUT = 1
|
|
||||||
Index: python-botocore/tests/functional/test_six_threading.py
|
Index: python-botocore/tests/functional/test_six_threading.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- python-botocore.orig/tests/functional/test_six_threading.py
|
--- python-botocore.orig/tests/functional/test_six_threading.py
|
||||||
|
@ -106,30 +71,15 @@ Index: python-botocore/tests/integration/test_client_http.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- python-botocore.orig/tests/integration/test_client_http.py
|
--- python-botocore.orig/tests/integration/test_client_http.py
|
||||||
+++ python-botocore/tests/integration/test_client_http.py
|
+++ python-botocore/tests/integration/test_client_http.py
|
||||||
@@ -14,8 +14,8 @@ from botocore.exceptions import (
|
@@ -16,7 +16,7 @@ from botocore.exceptions import (
|
||||||
ProxyConnectionError,
|
ProxyConnectionError,
|
||||||
ReadTimeoutError,
|
ReadTimeoutError,
|
||||||
)
|
)
|
||||||
-from botocore.vendored.requests import exceptions as requests_exceptions
|
-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 requests import exceptions as requests_exceptions
|
||||||
+from six.moves import BaseHTTPServer, socketserver
|
|
||||||
from tests import mock, unittest
|
from tests import mock, unittest
|
||||||
|
|
||||||
|
|
||||||
Index: python-botocore/tests/integration/test_glacier.py
|
|
||||||
===================================================================
|
|
||||||
--- python-botocore.orig/tests/integration/test_glacier.py
|
|
||||||
+++ python-botocore/tests/integration/test_glacier.py
|
|
||||||
@@ -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
|
|
||||||
from tests import unittest
|
|
||||||
|
|
||||||
|
|
||||||
Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
|
Index: python-botocore/tests/unit/test_http_client_exception_mapping.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py
|
--- python-botocore.orig/tests/unit/test_http_client_exception_mapping.py
|
||||||
|
|
Loading…
Reference in a new issue