01-unvendor-six.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455
  1. --- contrib/python/botocore/py2/botocore/compat.py (index)
  2. +++ contrib/python/botocore/py2/botocore/compat.py (working tree)
  3. @@ -22,7 +22,7 @@ import shlex
  4. import os
  5. from math import floor
  6. -from botocore.vendored import six
  7. +import six
  8. from botocore.exceptions import MD5UnavailableError
  9. from dateutil.tz import tzlocal
  10. from urllib3 import exceptions
  11. @@ -31,7 +31,7 @@ logger = logging.getLogger(__name__)
  12. if six.PY3:
  13. - from botocore.vendored.six.moves import http_client
  14. + from six.moves import http_client
  15. class HTTPHeaders(http_client.HTTPMessage):
  16. pass
  17. --- contrib/python/botocore/py2/botocore/endpoint.py (index)
  18. +++ contrib/python/botocore/py2/botocore/endpoint.py (working tree)
  19. @@ -17,7 +17,7 @@ import logging
  20. import time
  21. import threading
  22. -from botocore.vendored import six
  23. +from botocore.compat import six
  24. from botocore.awsrequest import create_request_object
  25. from botocore.exceptions import HTTPClientError
  26. --- contrib/python/botocore/py2/botocore/httpsession.py (index)
  27. +++ contrib/python/botocore/py2/botocore/httpsession.py (working tree)
  28. @@ -20,8 +20,8 @@ except ImportError:
  29. from urllib3.util.ssl_ import SSLContext
  30. import botocore.awsrequest
  31. -from botocore.vendored import six
  32. -from botocore.vendored.six.moves.urllib_parse import unquote
  33. +from botocore.compat import six
  34. +from six.moves.urllib_parse import unquote
  35. from botocore.compat import filter_ssl_warnings, urlparse
  36. from botocore.exceptions import (
  37. ConnectionClosedError, EndpointConnectionError, HTTPClientError,
  38. --- contrib/python/botocore/py2/botocore/utils.py (index)
  39. +++ contrib/python/botocore/py2/botocore/utils.py (working tree)
  40. @@ -35,7 +35,7 @@ from botocore.compat import (
  41. json, quote, zip_longest, urlsplit, urlunsplit, OrderedDict,
  42. six, urlparse, get_tzinfo_options, get_md5, MD5_AVAILABLE
  43. )
  44. -from botocore.vendored.six.moves.urllib.request import getproxies, proxy_bypass
  45. +from six.moves.urllib.request import getproxies, proxy_bypass
  46. from botocore.exceptions import (
  47. InvalidExpressionError, ConfigNotFound, InvalidDNSNameError, ClientError,
  48. MetadataRetrievalError, EndpointConnectionError, ReadTimeoutError,