summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Andrews <anotherjesse@gmail.com>2011-04-24 23:48:04 -0700
committerJesse Andrews <anotherjesse@gmail.com>2011-04-24 23:48:04 -0700
commit614ca53c78f6902d7cbffa3f025fbd873708b07c (patch)
tree1b453d364edc9f2f6783ceaa0da551fc7118f9a3
parent0ff4a9d4e42853b514dced8fe0ef9430235d82e4 (diff)
missed simplejson assumption
-rw-r--r--keystone/logic/types/tenant.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystone/logic/types/tenant.py b/keystone/logic/types/tenant.py
index 83bd1ed5..b161476b 100644
--- a/keystone/logic/types/tenant.py
+++ b/keystone/logic/types/tenant.py
@@ -71,7 +71,7 @@ class Tenant(object):
raise fault.BadRequestFault("Expecting Tenant Description")
description = tenant["description"]
return Tenant(tenant_id, description, set_enabled)
- except (json.decoder.JSONDecodeError, TypeError) as e:
+ except (ValueError, TypeError) as e:
raise fault.BadRequestFault("Cannot parse Tenant", str(e))
def to_dom(self):