diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-17 17:45:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-17 17:45:53 +0000 |
| commit | 60de2a453f77ee6fad1f7b619b31ac9caa60d7f6 (patch) | |
| tree | 983d2ea410092b04848047b9ea18d2e5b9dd74cf /openstack | |
| parent | 2399beca7d790105618a41f3dfcd0728a3048c0b (diff) | |
| parent | b81938dc2fec8f6e15b0b3dcb8eabc276e647af4 (diff) | |
| download | oslo-60de2a453f77ee6fad1f7b619b31ac9caa60d7f6.tar.gz oslo-60de2a453f77ee6fad1f7b619b31ac9caa60d7f6.tar.xz oslo-60de2a453f77ee6fad1f7b619b31ac9caa60d7f6.zip | |
Merge "Normalize_time() always return naive object"
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/timeutils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack/common/timeutils.py b/openstack/common/timeutils.py index 9901a4c..93b34fc 100644 --- a/openstack/common/timeutils.py +++ b/openstack/common/timeutils.py @@ -62,9 +62,11 @@ def parse_strtime(timestr, fmt=PERFECT_TIME_FORMAT): def normalize_time(timestamp): - """Normalize time in arbitrary timezone to UTC""" + """Normalize time in arbitrary timezone to UTC naive object""" 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): |