Merge pull request #160 from t-wissmann/master

vasily-v-ryabov · web-flow · commit 381bc18b012c · 2020-04-01T15:12:11.000+03:00
Fix TypeError in socket.error exception handling
diff --git a/Xlib/protocol/display.py b/Xlib/protocol/display.py
@@ -582,7 +582,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
                 try:
                     i = self.socket.send(self.data_send)
                 except socket.error as err:
-                    self.close_internal('server: %s' % err[1])
+                    self.close_internal('server: %s' % err)
                     raise self.socket_error
 
                 self.data_send = self.data_send[i:]
@@ -600,7 +600,7 @@ def send_and_recv(self, flush = None, event = None, request = None, recv = None)
                         count = max(self.recv_buffer_size, count)
                         bytes_recv = self.socket.recv(count)
                     except socket.error as err:
-                        self.close_internal('server: %s' % err[1])
+                        self.close_internal('server: %s' % err)
                         raise self.socket_error
 
                     if not bytes_recv:
