openstack/rally
Code Issues Proposed changes

Merge "Python 3 fix '+' operand in dict_items"

Browse Source
This commit is contained in:
Jenkins 2015-01-06 16:19:33 +00:00 committed by Gerrit Code Review
commit a731711988
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/exceptions.py
View File

@ -53,7 +53,7 @@ class RallyException(Exception):
pass
if "%(message)s" in self.msg_fmt:
kwargs = dict(kwargs.items() + {"message": message}.items())
kwargs.update({"message": message})
try:
message = self.msg_fmt % kwargs

3
rally/osclients.py
View File

@ -97,7 +97,8 @@ class Clients(object):
"timeout": CONF.openstack_client_http_timeout,
"insecure": CONF.https_insecure, "cacert": CONF.https_cacert
}
kw = dict(self.endpoint.to_dict().items() + new_kw.items())
kw = self.endpoint.to_dict()
kw.update(new_kw)
if kw["endpoint_type"] == consts.EndpointType.PUBLIC:
mgmt_url = parse.urlparse(kw["auth_url"])
if (mgmt_url.port != kw["admin_port"] and