diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-18 17:02:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-18 17:02:19 +0000 |
| commit | 5bfa8a70e8b11f68deb101c872eace27d7a3b1b4 (patch) | |
| tree | 9c298941f50a7b080518efc53016ec89426496a3 /nova/context.py | |
| parent | 60ea96b288d9d8f29d772dce3763fda466c73040 (diff) | |
| parent | 9ff3121bd90133fb3b37c0e10407b5f7ade26b90 (diff) | |
| download | nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.gz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.tar.xz nova-5bfa8a70e8b11f68deb101c872eace27d7a3b1b4.zip | |
Merge "Replaces functions in utils.py with openstack/common/timeutils.py"
Diffstat (limited to 'nova/context.py')
| -rw-r--r-- | nova/context.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/context.py b/nova/context.py index 2b97b0f54..f2bb6b5d6 100644 --- a/nova/context.py +++ b/nova/context.py @@ -23,6 +23,7 @@ import copy from nova import log as logging from nova.openstack.common import local +from nova.openstack.common import timeutils from nova import utils @@ -71,9 +72,9 @@ class RequestContext(object): self.read_deleted = read_deleted self.remote_address = remote_address if not timestamp: - timestamp = utils.utcnow() + timestamp = timeutils.utcnow() if isinstance(timestamp, basestring): - timestamp = utils.parse_strtime(timestamp) + timestamp = timeutils.parse_strtime(timestamp) self.timestamp = timestamp if not request_id: request_id = generate_request_id() @@ -115,7 +116,7 @@ class RequestContext(object): 'read_deleted': self.read_deleted, 'roles': self.roles, 'remote_address': self.remote_address, - 'timestamp': utils.strtime(self.timestamp), + 'timestamp': timeutils.strtime(self.timestamp), 'request_id': self.request_id, 'auth_token': self.auth_token, 'quota_class': self.quota_class, |