diff options
| author | Victor Stinner <victor.stinner@enovance.com> | 2014-03-24 18:16:51 +0100 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-28 15:48:50 +0000 |
| commit | 12f86fdcc57896bac62d36c74a80fd19adeeac58 (patch) | |
| tree | edf38583f4ad8925e5d3b4162e77f4de13b9a1ed /swiftclient/utils.py | |
| parent | cdf6f84c360088d39af1b8e1745c102fc44ac362 (diff) | |
| download | python-swiftclient-12f86fdcc57896bac62d36c74a80fd19adeeac58.tar.gz | |
Python 3: Get compatible types from six
* Replace unicode with six.text_type
* Replace basestring with six.string_types
* The long type doesn't exist in Python 3 anymore: replace 1L with long(1) and
only test this type with Python 2
* Fix quote(): quote the URL if the string is a byte string. Use "bytes" type
instead of "str" to be Python 3 compatible.
Change-Id: I1df5aa85e4e7d07191fb5c654d52fc4bd8b9f440
Diffstat (limited to 'swiftclient/utils.py')
| -rw-r--r-- | swiftclient/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
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): |