From 614ca53c78f6902d7cbffa3f025fbd873708b07c Mon Sep 17 00:00:00 2001 From: Jesse Andrews Date: Sun, 24 Apr 2011 23:48:04 -0700 Subject: missed simplejson assumption --- keystone/logic/types/tenant.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): -- cgit