Skip to content

Commit

Permalink
remove the UUID check for userids
Browse files Browse the repository at this point in the history
Change-Id: I548d8ea292f737a6b5b0dddd8271a0cf690392a0
Fixes: bug #1189933
  • Loading branch information
msolberg authored and Adam Young committed Aug 27, 2013
1 parent 415e016 commit 1bd5b73
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions keystoneclient/utils.py
@@ -1,7 +1,6 @@
import getpass
import hashlib
import sys
import uuid

import prettytable

Expand Down Expand Up @@ -78,11 +77,10 @@ def find_resource(manager, name_or_id):
except exceptions.NotFound:
pass

# now try to get entity as uuid
# now try the entity as a string
try:
uuid.UUID(str(name_or_id))
return manager.get(name_or_id)
except (ValueError, exceptions.NotFound):
except (exceptions.NotFound):
pass

# finally try to find entity by name
Expand Down

0 comments on commit 1bd5b73

Please sign in to comment.