From 720f62232dc024c7a2b2cc59b66f06a5e0ba44bc Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Wed, 20 Jul 2011 15:57:34 -0500 Subject: Avoiding overloading of built-in: type() --- keystone/test/unit/test_common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keystone/test/unit/test_common.py b/keystone/test/unit/test_common.py index b6104e6b..133ee42b 100755 --- a/keystone/test/unit/test_common.py +++ b/keystone/test/unit/test_common.py @@ -171,7 +171,7 @@ def delete_global_group_xml(groupid, auth_token): return (resp, content) -def get_token_xml(user, pswd, tenant_id, type=''): +def get_token_xml(user, pswd, tenant_id, return_type=''): header = httplib2.Http(".cache") url = '%stokens' % URL body = ' \ @@ -191,7 +191,7 @@ def get_token_xml(user, pswd, tenant_id, type=''): else: token = None - if type == 'token': + if return_type == 'token': return token else: return (resp, content) -- cgit