summaryrefslogtreecommitdiffstats
path: root/nova/context.py
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-02-15 15:01:41 -0500
committerBrian Waldon <brian.waldon@rackspace.com>2011-02-15 15:01:41 -0500
commit8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (patch)
treea7f13616e6d7cd393b717e7c59766d43b9a07c8c /nova/context.py
parent4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b (diff)
parent273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff)
downloadnova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.gz
nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.xz
nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.zip
merging trunk back in; updating Authors conflict
Diffstat (limited to 'nova/context.py')
-rw-r--r--nova/context.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/context.py b/nova/context.py
index f2669c9f1..0256bf448 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -28,7 +28,6 @@ from nova import utils
class RequestContext(object):
-
def __init__(self, user, project, is_admin=None, read_deleted=False,
remote_address=None, timestamp=None, request_id=None):
if hasattr(user, 'id'):
@@ -53,7 +52,7 @@ class RequestContext(object):
self.read_deleted = read_deleted
self.remote_address = remote_address
if not timestamp:
- timestamp = datetime.datetime.utcnow()
+ timestamp = utils.utcnow()
if isinstance(timestamp, str) or isinstance(timestamp, unicode):
timestamp = utils.parse_isotime(timestamp)
self.timestamp = timestamp
@@ -101,7 +100,7 @@ class RequestContext(object):
return cls(**values)
def elevated(self, read_deleted=False):
- """Return a version of this context with admin flag set"""
+ """Return a version of this context with admin flag set."""
return RequestContext(self.user_id,
self.project_id,
True,