Merge "Fix python 3.x related Hacking warnings"

2013-11-12 04:38:33 +00:00
parent 518cb2508d 69fa91b432
commit 12a1d719b2
5 changed files with 82 additions and 72 deletions
@@ -230,7 +230,8 @@ class HTTPClient(object):
            raise exc.InvalidEndpoint(message=message)
        except (socket.error, socket.timeout) as e:
            endpoint = self.endpoint
-            message = "Error communicating with %(endpoint)s %(e)s" % locals()
+            message = ("Error communicating with %(endpoint)s %(e)s" %
+                       {'endpoint': endpoint, 'e': e})
            raise exc.CommunicationError(message=message)

        body_iter = ResponseBodyIterator(resp)