diff options
Diffstat (limited to 'swiftclient')
| -rw-r--r-- | swiftclient/client.py | 5 | ||||
| -rw-r--r-- | swiftclient/utils.py | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py index 5ebbcf2..2cb54a1 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -28,6 +28,7 @@ from requests.exceptions import RequestException, SSLError from six.moves.urllib.parse import quote as _quote from six.moves.urllib.parse import urlparse, urlunparse from time import sleep, time +import six from swiftclient.exceptions import ClientException, InvalidHeadersException from swiftclient.utils import LengthWrapper @@ -97,7 +98,7 @@ def quote(value, safe='/'): Patched version of urllib.quote that encodes utf8 strings before quoting """ value = encode_utf8(value) - if isinstance(value, str): + if isinstance(value, bytes): return _quote(value, safe) else: return value @@ -117,7 +118,7 @@ def validate_headers(headers): def encode_utf8(value): - if isinstance(value, unicode): + if isinstance(value, six.text_type): value = value.encode('utf8') return value diff --git a/swiftclient/utils.py b/swiftclient/utils.py index 5095f9d..058181d 100644 --- a/swiftclient/utils.py +++ b/swiftclient/utils.py @@ -14,6 +14,8 @@ # limitations under the License. """Miscellaneous utility functions for use with Swift.""" +import six + TRUE_VALUES = set(('true', '1', 'yes', 'on', 't', 'y')) @@ -24,7 +26,7 @@ def config_true_value(value): This function come from swift.common.utils.config_true_value() """ return value is True or \ - (isinstance(value, basestring) and value.lower() in TRUE_VALUES) + (isinstance(value, six.string_types) and value.lower() in TRUE_VALUES) def prt_bytes(bytes, human_flag): |