diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-27 21:24:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-27 21:24:41 +0000 |
| commit | e92bfac838e7419c75e51a25fa2f433bf7ebee3e (patch) | |
| tree | 189928f0b16400784490ac974b3768f4d267d3e5 /nova/api | |
| parent | 1b372a7bddb3095b0672e2de750c43922783b440 (diff) | |
| parent | 51e7bcf5f49037effa25496233678a917d6a1de3 (diff) | |
| download | nova-e92bfac838e7419c75e51a25fa2f433bf7ebee3e.tar.gz nova-e92bfac838e7419c75e51a25fa2f433bf7ebee3e.tar.xz nova-e92bfac838e7419c75e51a25fa2f433bf7ebee3e.zip | |
Merge "'except:' to 'except Exception:' as per HACKING"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/v2/contrib/simple_tenant_usage.py | 4 |
1 files changed, 2 insertions, 2 deletions
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): |