From 51e7bcf5f49037effa25496233678a917d6a1de3 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 27 Dec 2011 12:07:06 -0800 Subject: 'except:' to 'except Exception:' as per HACKING Change-Id: I6e372152946dc7b51a4d84d6f4b893774e7d1a1d --- nova/api/openstack/v2/contrib/simple_tenant_usage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/v2/contrib/simple_tenant_usage.py b/nova/api/openstack/v2/contrib/simple_tenant_usage.py index dedc32b44..c93fb5550 100644 --- a/nova/api/openstack/v2/contrib/simple_tenant_usage.py +++ b/nova/api/openstack/v2/contrib/simple_tenant_usage.py @@ -157,10 +157,10 @@ class SimpleTenantUsageController(object): return dtstr try: return datetime.strptime(dtstr, "%Y-%m-%dT%H:%M:%S") - except: + except Exception: try: return datetime.strptime(dtstr, "%Y-%m-%dT%H:%M:%S.%f") - except: + except Exception: return datetime.strptime(dtstr, "%Y-%m-%d %H:%M:%S.%f") def _get_datetime_range(self, req): -- cgit