diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-04 22:42:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-04 22:42:52 +0000 |
| commit | 1be4d7b6be3c482d8d8b6e23c610f71e004760df (patch) | |
| tree | a809f7a15635d5f07dfba2d07a30fe1bd48e9cfb | |
| parent | 1b81b509042513a17b2a0f150ec38d35581fa86b (diff) | |
| parent | 269aa32a09af6200b4cafecf1cafb8ca34322b04 (diff) | |
| download | nova-1be4d7b6be3c482d8d8b6e23c610f71e004760df.tar.gz nova-1be4d7b6be3c482d8d8b6e23c610f71e004760df.tar.xz nova-1be4d7b6be3c482d8d8b6e23c610f71e004760df.zip | |
Merge "Sync timeutils changes from Oslo"
| -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) |