Fix dict.keys() compatibility for python 3

Tang Chen · Tang Chen · commit dc7e4fc15d80 · 2016-03-12T10:58:28.000+08:00
In Python 2, dict.keys() will return a list.
But in Python 3, it will return an iterator.
So we need to fix all the places that assuming
dict.keys() is a list.

Change-Id: I8d1cc536377b3e5c644cfaa0892e40d0bd7c11b1
Closes-Bug: #1556350
diff --git a/openstackclient/common/commandmanager.py b/openstackclient/common/commandmanager.py
@@ -56,4 +56,4 @@ def get_command_names(self, group=None):
                 )
                 group_list.append(cmd_name)
             return group_list
-        return self.commands.keys()
+        return list(self.commands.keys())
diff --git a/openstackclient/common/exceptions.py b/openstackclient/common/exceptions.py
@@ -122,7 +122,7 @@ def from_response(response, body):
     cls = _code_map.get(response.status, ClientException)
     if body:
         if hasattr(body, 'keys'):
-            error = body[body.keys()[0]]
+            error = body[list(body.keys())[0]]
             message = error.get('message')
             details = error.get('details')
         else:
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
@@ -281,7 +281,7 @@ def get_client_class(api_name, version, version_map):
         client_path = version_map[str(version)]
     except (KeyError, ValueError):
         msg = "Invalid %s client version '%s'. must be one of: %s" % (
-              (api_name, version, ', '.join(version_map.keys())))
+              (api_name, version, ', '.join(list(version_map.keys()))))
         raise exceptions.UnsupportedVersion(msg)
 
     return importutils.import_class(client_path)
diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
@@ -18,7 +18,7 @@
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/network.py b/openstackclient/network/v2/network.py
@@ -38,7 +38,7 @@ def _format_router_external(item):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
@@ -36,7 +36,7 @@ def _format_admin_state(state):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
@@ -42,7 +42,7 @@ def _format_external_gateway_info(info):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
@@ -27,7 +27,7 @@ def _format_security_group_rule_show(obj):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
@@ -31,7 +31,7 @@ def _format_allocation_pools(data):
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
@@ -20,7 +20,7 @@
 
 
 def _get_columns(item):
-    columns = item.keys()
+    columns = list(item.keys())
     if 'tenant_id' in columns:
         columns.remove('tenant_id')
         columns.append('project_id')
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
@@ -355,7 +355,7 @@ def initialize_app(self, argv):
                         self.log.warning(
                             "%s version %s is not in supported versions %s"
                             % (api, version_opt,
-                               ', '.join(mod.API_VERSIONS.keys())))
+                               ', '.join(list(mod.API_VERSIONS.keys()))))
 
                 # Command groups deal only with major versions
                 version = '.v' + version_opt.replace('.', '_').split('_')[0]

Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,4 @@ def get_command_names(self, group=None):`
`56`	`56`	`)`
`57`	`57`	`group_list.append(cmd_name)`
`58`	`58`	`return group_list`
`59`		`- return self.commands.keys()`
	`59`	`+ return list(self.commands.keys())`