diff options
| author | Dan Smith <danms@us.ibm.com> | 2013-01-03 09:36:54 -0800 |
|---|---|---|
| committer | Dan Smith <danms@us.ibm.com> | 2013-01-04 08:11:37 -0800 |
| commit | 269aa32a09af6200b4cafecf1cafb8ca34322b04 (patch) | |
| tree | 7314ea481b7ce412ac7e79ff301351ac30add466 /nova/openstack | |
| parent | e034a126dade15f05014f6a9eb85562f59714f63 (diff) | |
| download | nova-269aa32a09af6200b4cafecf1cafb8ca34322b04.tar.gz nova-269aa32a09af6200b4cafecf1cafb8ca34322b04.tar.xz nova-269aa32a09af6200b4cafecf1cafb8ca34322b04.zip | |
Sync timeutils changes from Oslo
Change-Id: I5eddfbad43a2f57e6b2af6299e480c32b11a5d19
Diffstat (limited to 'nova/openstack')
| -rw-r--r-- | nova/openstack/common/timeutils.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/openstack/common/timeutils.py b/nova/openstack/common/timeutils.py index 86004391d..f433b718b 100644 --- a/nova/openstack/common/timeutils.py +++ b/nova/openstack/common/timeutils.py @@ -71,11 +71,15 @@ def normalize_time(timestamp): def is_older_than(before, seconds): """Return True if before is older than seconds.""" + if isinstance(before, str): + before = parse_strtime(before).replace(tzinfo=None) return utcnow() - before > datetime.timedelta(seconds=seconds) def is_newer_than(after, seconds): """Return True if after is newer than seconds.""" + if isinstance(after, str): + after = parse_strtime(after).replace(tzinfo=None) return after - utcnow() > datetime.timedelta(seconds=seconds) |