Merge "py33: uuid verification in find_resource()"
This commit is contained in:
commit
55bf39f2d1
@ -204,8 +204,11 @@ def find_resource(manager, name_or_id, **find_args):
|
|||||||
|
|
||||||
# now try to get entity as uuid
|
# now try to get entity as uuid
|
||||||
try:
|
try:
|
||||||
uuid.UUID(strutils.safe_encode(name_or_id))
|
tmp_id = strutils.safe_encode(name_or_id)
|
||||||
return manager.get(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):
|
except (TypeError, ValueError, exceptions.NotFound):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user