diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-10 09:02:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-10 09:02:48 +0000 |
| commit | dd22fc130fbeca3363b81e934d0e5f231a650917 (patch) | |
| tree | acf5da0257f4fcd0b3637f01307c09a00c98c6ab /keystoneclient | |
| parent | f942df2f5ffb3762ac5b08f1ce1553296b3a93ae (diff) | |
| parent | f9e3b7adc980ae6722dfa59f8785ccaa4dc45c04 (diff) | |
| download | python-keystoneclient-dd22fc130fbeca3363b81e934d0e5f231a650917.tar.gz | |
Merge "Do not try to call decode() on a text string"
Diffstat (limited to 'keystoneclient')
| -rw-r--r-- | keystoneclient/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystoneclient/utils.py b/keystoneclient/utils.py index a39af23..b2e371b 100644 --- a/keystoneclient/utils.py +++ b/keystoneclient/utils.py @@ -101,7 +101,7 @@ def find_resource(manager, name_or_id): # finally try to find entity by name try: - if isinstance(name_or_id, str): + if isinstance(name_or_id, six.binary_type): name_or_id = name_or_id.decode('utf-8', 'strict') return manager.find(name=name_or_id) except exceptions.NotFound: |