use proper string formatting in socketdisconnectederrors

Parsely · Jul 19, 2017 · 4c41307 · 4c41307
1 parent 89ddfdb
commit 4c41307
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pykafka/connection.py b/pykafka/connection.py
@@ -170,7 +170,7 @@ def connect(self, timeout):
                 ))
         except (self._handler.SockErr, self._handler.GaiError):
             log.info("Failed to connect to %s:%s", self.host, self.port)
-            raise SocketDisconnectedError("<broker %s:%s>" % (self.host, self.port))
+            raise SocketDisconnectedError("<broker {}:{}>".format(self.host, self.port))
         log.debug("Successfully connected to %s:%s", self.host, self.port)
 
     def disconnect(self):
@@ -193,13 +193,13 @@ def request(self, request):
         """Send a request over the socket connection"""
         bytes_ = request.get_bytes()
         if not self._socket:
-            raise SocketDisconnectedError("<broker %s:%s>" % (self.host, self.port))
+            raise SocketDisconnectedError("<broker {}:{}>".format(self.host, self.port))
         try:
             self._socket.sendall(bytes_)
         except self._handler.SockErr as e:
             log.error("Failed to send data, error: %s" % repr(e))
             self.disconnect()
-            raise SocketDisconnectedError("<broker %s:%s>" % (self.host, self.port))
+            raise SocketDisconnectedError("<broker {}:{}>".format(self.host, self.port))
 
     def response(self):
         """Wait for a response from the broker"""
@@ -213,13 +213,13 @@ def response(self):
             if r is None or len(r) == 0:
                 # Happens when broker has shut down
                 self.disconnect()
-                raise SocketDisconnectedError("<broker %s:%s>" % (self.host, self.port))
+                raise SocketDisconnectedError("<broker {}:{}>".format(self.host, self.port))
             size += r
         size = struct.unpack('!i', size)[0]
         try:
             recvall_into(self._socket, self._buff, size)
         except SocketDisconnectedError:
             self.disconnect()
-            raise SocketDisconnectedError("<broker %s:%s>" % (self.host, self.port))
+            raise SocketDisconnectedError("<broker {}:{}>".format(self.host, self.port))
         # Drop CorrelationId => int32
         return buffer(self._buff[4:4 + size])