projects / packages / python-boto.git / blame
| Commit | Line | Data |
|---|---|---|
| dcea9012 JB |
1 | Index: boto-2.39.0/boto/compat.py |
| 2 | =================================================================== | |
| 3 | --- boto-2.39.0.orig/boto/compat.py | |
| 4 | +++ boto-2.39.0/boto/compat.py | |
| 5 | @@ -46,16 +46,27 @@ except (AttributeError, ImportError): | |
| 6 | # This is probably running on App Engine. | |
| 7 | expanduser = (lambda x: x) | |
| 8 | ||
| 9 | -from boto.vendored import six | |
| 10 | +try: | |
| 11 | + import six | |
| 12 | + from six import BytesIO, StringIO | |
| 13 | + from six.moves import filter, http_client, map, _thread, \ | |
| 14 | + urllib, zip | |
| 15 | + from six.moves.queue import Queue | |
| 16 | + from six.moves.urllib.parse import parse_qs, quote, unquote, \ | |
| 17 | + urlparse, urlsplit | |
| 18 | + from six.moves.urllib.parse import unquote_plus | |
| 19 | + from six.moves.urllib.request import urlopen | |
| 20 | +except ImportError: | |
| 21 | + from boto.vendored import six | |
| 22 | ||
| 23 | -from boto.vendored.six import BytesIO, StringIO | |
| 24 | -from boto.vendored.six.moves import filter, http_client, map, _thread, \ | |
| 25 | - urllib, zip | |
| 26 | -from boto.vendored.six.moves.queue import Queue | |
| 27 | -from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \ | |
| 28 | - urlparse, urlsplit | |
| 29 | -from boto.vendored.six.moves.urllib.parse import unquote_plus | |
| 30 | -from boto.vendored.six.moves.urllib.request import urlopen | |
| 31 | + from boto.vendored.six import BytesIO, StringIO | |
| 32 | + from boto.vendored.six.moves import filter, http_client, map, _thread, \ | |
| 33 | + urllib, zip | |
| 34 | + from boto.vendored.six.moves.queue import Queue | |
| 35 | + from boto.vendored.six.moves.urllib.parse import parse_qs, quote, unquote, \ | |
| 36 | + urlparse, urlsplit | |
| 37 | + from boto.vendored.six.moves.urllib.parse import unquote_plus | |
| 38 | + from boto.vendored.six.moves.urllib.request import urlopen | |
| 39 | ||
| 40 | if six.PY3: | |
| 41 | # StandardError was removed, so use the base exception type instead | |
| 42 | Index: boto-2.39.0/setup.py | |
| 43 | =================================================================== | |
| 44 | --- boto-2.39.0.orig/setup.py | |
| 45 | +++ boto-2.39.0/setup.py | |
| 46 | @@ -76,7 +76,7 @@ setup(name = "boto", | |
| 47 | "boto.elastictranscoder", "boto.opsworks", "boto.redshift", | |
| 48 | "boto.dynamodb2", "boto.support", "boto.cloudtrail", | |
| 49 | "boto.directconnect", "boto.kinesis", "boto.rds2", | |
| 50 | - "boto.cloudsearch2", "boto.logs", "boto.vendored", | |
| 51 | + "boto.cloudsearch2", "boto.logs", | |
| 52 | "boto.route53.domains", "boto.cognito", | |
| 53 | "boto.cognito.identity", "boto.cognito.sync", | |
| 54 | "boto.cloudsearchdomain", "boto.kms", |