summaryrefslogtreecommitdiff
path: root/keystoneclient/middleware
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2013-08-04 01:43:41 +0000
committerChuck Short <chuck.short@canonical.com>2013-08-04 01:46:48 +0000
commit8d2f9dd456da303ff16af860fc28cd116c4f154e (patch)
tree010f9f5f31522dea140ea8219a7caea4e952fe0d /keystoneclient/middleware
parent98c8385d2202a71b8e55de1ec821bc2a28188bc5 (diff)
downloadpython-keystoneclient-8d2f9dd456da303ff16af860fc28cd116c4f154e.tar.gz
python3: Add basic compatibility support
Use six.iteritems to replace dictionary.iteritems() on python2 or dictionary.items() on python3. Change-Id: I623009200f3a90985a2c0178673df7d54b36a686 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'keystoneclient/middleware')
-rw-r--r--keystoneclient/middleware/auth_token.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py
index 3d59002..b19c6a4 100644
--- a/keystoneclient/middleware/auth_token.py
+++ b/keystoneclient/middleware/auth_token.py
@@ -154,6 +154,8 @@ import tempfile
import time
import urllib
+import six
+
from keystoneclient.common import cms
from keystoneclient.middleware import memcache_crypt
from keystoneclient.openstack.common import jsonutils
@@ -843,7 +845,7 @@ class AuthProtocol(object):
def _add_headers(self, env, headers):
"""Add http headers to environment."""
- for (k, v) in headers.iteritems():
+ for (k, v) in six.iteritems(headers):
env_key = self._header_to_env_var(k)
env[env_key] = v