From 1bd5b7328b2d25f88856912d25a89637996cceb5 Mon Sep 17 00:00:00 2001 From: Michael Solberg Date: Tue, 11 Jun 2013 12:00:14 -0400 Subject: [PATCH] remove the UUID check for userids Change-Id: I548d8ea292f737a6b5b0dddd8271a0cf690392a0 Fixes: bug #1189933 --- keystoneclient/utils.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keystoneclient/utils.py b/keystoneclient/utils.py index 12d9eeac4..f4b547a54 100644 --- a/keystoneclient/utils.py +++ b/keystoneclient/utils.py @@ -1,7 +1,6 @@ import getpass import hashlib import sys -import uuid import prettytable @@ -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