12-unvendor-six.patch 1.1 KB

1234567891011121314151617181920
  1. --- contrib/python/boto/py3/boto/compat.py (index)
  2. +++ contrib/python/boto/py3/boto/compat.py (working tree)
  3. @@ -49 +49 @@ except (AttributeError, ImportError):
  4. -from boto.vendored import six
  5. +import six
  6. @@ -51,2 +51,2 @@ from boto.vendored import six
  7. -from boto.vendored.six import BytesIO, StringIO
  8. -from boto.vendored.six.moves import filter, http_client, map, _thread, \
  9. +from six import BytesIO, StringIO
  10. +from six.moves import filter, http_client, map, _thread, \
  11. @@ -54,2 +54,2 @@ from boto.vendored.six.moves import filter, http_client, map, _thread, \
  12. -from boto.vendored.six.moves.queue import Queue
  13. -from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \
  14. +from six.moves.queue import Queue
  15. +from six.moves.urllib.parse import parse_qs, quote, unquote, \
  16. @@ -57,2 +57,2 @@ from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \
  17. -from boto.vendored.six.moves.urllib.parse import unquote_plus
  18. -from boto.vendored.six.moves.urllib.request import urlopen
  19. +from six.moves.urllib.parse import unquote_plus
  20. +from six.moves.urllib.request import urlopen