Merge "python3: Add basic compatibility support"

1 files changed, 4 insertions, 2 deletions

diff --git a/keystoneclient/generic/shell.py b/keystoneclient/generic/shell.py
index e4a5263..97f6308 100644
--- a/keystoneclient/generic/shell.py
+++ b/keystoneclient/generic/shell.py
@@ -18,6 +18,8 @@
 from keystoneclient.generic import client
 from keystoneclient import utils
 
+import six
+
 CLIENT_CLASS = client.Client
 
 
@@ -45,13 +47,13 @@ def do_discover(cs, args):
     if versions:
         if 'message' in versions:
             print(versions['message'])
-        for key, version in versions.iteritems():
+        for key, version in six.iteritems(versions):
             if key != 'message':
                 print ("    - supports version %s (%s) here %s" %
                        (version['id'], version['status'], version['url']))
                 extensions = cs.discover_extensions(version['url'])
                 if extensions:
-                    for key, extension in extensions.iteritems():
+                    for key, extension in six.iteritems(extensions):
                         if key != 'message':
                             print ("        - and %s: %s" %
                                    (key, extension))