diff options
| author | Dolph Mathews <dolph.mathews@rackspace.com> | 2011-07-20 15:57:34 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@rackspace.com> | 2011-07-20 15:57:34 -0500 |
| commit | 720f62232dc024c7a2b2cc59b66f06a5e0ba44bc (patch) | |
| tree | fab5c18a878360b661cb0fabfdc58cc2aa5a3797 | |
| parent | c42075dc82770e8b05f86da4d6ddc14d32ee011c (diff) | |
| download | keystone-720f62232dc024c7a2b2cc59b66f06a5e0ba44bc.tar.gz keystone-720f62232dc024c7a2b2cc59b66f06a5e0ba44bc.tar.xz keystone-720f62232dc024c7a2b2cc59b66f06a5e0ba44bc.zip | |
Avoiding overloading of built-in: type()
| -rwxr-xr-x | keystone/test/unit/test_common.py | 4 |
1 files 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 = '<?xml version="1.0" encoding="UTF-8"?> \ @@ -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) |