openstack/python-novaclient
Code Issues Proposed changes

Merge "py33: uuid verification in find_resource()"

Browse Source
This commit is contained in:
Jenkins 2013-10-02 23:56:33 +00:00 committed by Gerrit Code Review
commit 55bf39f2d1
1 changed files with 5 additions and 2 deletions

7
novaclient/utils.py

@ -204,8 +204,11 @@ def find_resource(manager, name_or_id, **find_args):
# now try to get entity as uuid
try:
uuid.UUID(strutils.safe_encode(name_or_id))
return manager.get(name_or_id)
tmp_id = strutils.safe_encode(name_or_id)
if six.PY3:
tmp_id = tmp_id.decode()
uuid.UUID(tmp_id)
return manager.get(tmp_id)
except (TypeError, ValueError, exceptions.NotFound):
pass