x/gantt
Code Issues Proposed changes

Sync with latest version of openstack.common.timeutils

Browse Source 
Changes since last sync:

    - Added is_newer_than function
    - Normalize_time() always return naive object
    - Use pep8 v1.3.3

Change-Id: I47c74671907a2f64a3fdd2caf857999c33033bdd
This commit is contained in:
Yunhong, Jiang 2012-10-23 16:07:29 +08:00
parent 21370550e6
commit c904d14bbd
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nova/openstack/common/timeutils.py
View File

@ -62,9 +62,11 @@ def parse_strtime(timestr, fmt=PERFECT_TIME_FORMAT):
def normalize_time(timestamp): def normalize_time(timestamp):
"""Normalize time in arbitrary timezone to UTC""" """Normalize time in arbitrary timezone to UTC naive object"""
offset = timestamp.utcoffset() offset = timestamp.utcoffset()
return timestamp.replace(tzinfo=None) - offset if offset else timestamp if offset is None:
return timestamp
return timestamp.replace(tzinfo=None) - offset
def is_older_than(before, seconds): def is_older_than(before, seconds):
@ -72,6 +74,11 @@ def is_older_than(before, seconds):
return utcnow() - before > datetime.timedelta(seconds=seconds) return utcnow() - before > datetime.timedelta(seconds=seconds)
def is_newer_than(after, seconds):
"""Return True if after is newer than seconds."""
return after - utcnow() > datetime.timedelta(seconds=seconds)
def utcnow_ts(): def utcnow_ts():
"""Timestamp version of our utcnow function.""" """Timestamp version of our utcnow function."""
return calendar.timegm(utcnow().timetuple()) return calendar.timegm(utcnow().timetuple())
@ -121,6 +128,10 @@ def marshall_now(now=None):
def unmarshall_time(tyme): def unmarshall_time(tyme):
"""Unmarshall a datetime dict.""" """Unmarshall a datetime dict."""
return datetime.datetime(day=tyme['day'], month=tyme['month'], return datetime.datetime(day=tyme['day'],
year=tyme['year'], hour=tyme['hour'], minute=tyme['minute'], month=tyme['month'],
second=tyme['second'], microsecond=tyme['microsecond']) year=tyme['year'],
hour=tyme['hour'],
minute=tyme['minute'],
second=tyme['second'],
microsecond=tyme['microsecond'])