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

openstack · Jan 6, 2015 · a731711 · a731711
2 parents e56322d + 3208713
commit a731711
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rally/exceptions.py b/rally/exceptions.py
@@ -53,7 +53,7 @@ def __init__(self, message=None, **kwargs):
                 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

diff --git a/rally/osclients.py b/rally/osclients.py
@@ -97,7 +97,8 @@ def keystone(self):
             "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