From 5aca2e2df66c124696589ed3d45aae218fe2c91e Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Wed, 23 May 2012 22:17:35 +0800 Subject: Use utils.utcnow rather than datetime.utcnow Fixes bug #1003587 Edit direct use of datetime.utcnow or datetime.now to utilize utils.utcnow Change-Id: I1130f6e664f252fc5da7304f495dc9f980721224 --- nova/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/utils.py') diff --git a/nova/utils.py b/nova/utils.py index af55bdb2e..46118a718 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -488,7 +488,7 @@ def utcnow_ts(): return time.mktime(utcnow().timetuple()) -def set_time_override(override_time=datetime.datetime.utcnow()): +def set_time_override(override_time=utcnow()): """Override utils.utcnow to return a constant time.""" utcnow.override_time = override_time @@ -524,7 +524,7 @@ def parse_strtime(timestr, fmt=PERFECT_TIME_FORMAT): def isotime(at=None): """Stringify time in ISO 8601 format""" if not at: - at = datetime.datetime.utcnow() + at = utcnow() str = at.strftime(ISO_TIME_FORMAT) tz = at.tzinfo.tzname(None) if at.tzinfo else 'UTC' str += ('Z' if tz == 'UTC' else tz) -- cgit