diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-17 19:32:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-17 19:32:29 +0000 |
| commit | a29c6be97d923bdfb10bdb1d68a45190930e8212 (patch) | |
| tree | e71c2265462dac8f3439577f4a11f656a919e95c /glanceclient/v1/apiclient/utils.py | |
| parent | dca62b4de1a366a869ff9feb88dbb830e1055b7b (diff) | |
| parent | b513c8db4bf6a5b2eb0366117ca22e042dd3529e (diff) | |
| download | python-glanceclient-a29c6be97d923bdfb10bdb1d68a45190930e8212.tar.gz | |
Merge "Do not use the six library."
Diffstat (limited to 'glanceclient/v1/apiclient/utils.py')
| -rw-r--r-- | glanceclient/v1/apiclient/utils.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/glanceclient/v1/apiclient/utils.py b/glanceclient/v1/apiclient/utils.py index 814a37b..7d3e4e0 100644 --- a/glanceclient/v1/apiclient/utils.py +++ b/glanceclient/v1/apiclient/utils.py @@ -26,7 +26,6 @@ from oslo_utils import encodeutils from oslo_utils import uuidutils -import six from glanceclient._i18n import _ from glanceclient.v1.apiclient import exceptions @@ -52,10 +51,7 @@ def find_resource(manager, name_or_id, **find_args): # now try to get entity as uuid try: - if six.PY2: - tmp_id = encodeutils.safe_encode(name_or_id) - else: - tmp_id = encodeutils.safe_decode(name_or_id) + tmp_id = encodeutils.safe_decode(name_or_id) if uuidutils.is_uuid_like(tmp_id): return manager.get(tmp_id) |