From ab50ac0c9b8e9dbf2a2f353f68c2b7f397175df2 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 10 Mar 2013 19:04:42 -0400 Subject: Fix inconsistency with auth_tok/auth_token Switch to using auth_token instead of auth_ok Fixes LP# 1152826 Change-Id: I56569c1fa8f29b0474440c40644729d436d41c7b --- openstack/common/context.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openstack') diff --git a/openstack/common/context.py b/openstack/common/context.py index dd7dd04..442ab1d 100644 --- a/openstack/common/context.py +++ b/openstack/common/context.py @@ -37,9 +37,9 @@ class RequestContext(object): accesses the system, as well as additional request information. """ - def __init__(self, auth_tok=None, user=None, tenant=None, is_admin=False, + def __init__(self, auth_token=None, user=None, tenant=None, is_admin=False, read_only=False, show_deleted=False, request_id=None): - self.auth_tok = auth_tok + self.auth_token = auth_token self.user = user self.tenant = tenant self.is_admin = is_admin @@ -55,7 +55,7 @@ class RequestContext(object): 'is_admin': self.is_admin, 'read_only': self.read_only, 'show_deleted': self.show_deleted, - 'auth_token': self.auth_tok, + 'auth_token': self.auth_token, 'request_id': self.request_id} -- cgit