openstack
/
osc-lib
Code Issues Proposed changes

Merge "Fix dict.keys() compatibility for python 3"

This commit is contained in:
Jenkins 2016-03-14 14:51:57 +00:00 committed by Gerrit Code Review
parent d8b22fca34 951f166210
commit 81b265db81
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstackclient/common/commandmanager.py
View File

@ -56,4 +56,4 @@ class CommandManager(cliff.commandmanager.CommandManager):
)
group_list.append(cmd_name)
return group_list
return self.commands.keys()
return list(self.commands.keys())

2
openstackclient/common/exceptions.py
View File

@ -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:

2
openstackclient/common/utils.py
View File

@ -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)

2
openstackclient/shell.py
View File

@ -355,7 +355,7 @@ class OpenStackShell(app.App):
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]