py3: socket.error is deprecated

lib/util.py

@@ -676,18 +676,10 @@ class SocketPipe:
                 print_error("SSLError:", e)
                 time.sleep(0.1)
                 continue
-            except socket.error as e:
+            except OSError as e:
-                if e[0] in (errno.EWOULDBLOCK,errno.EAGAIN):
+                print_error("OSError", e)
-                    print_error("EAGAIN: retrying")
                 time.sleep(0.1)
                 continue
-                elif e[0] in ['timed out', 'The write operation timed out']:
-                    print_error("socket timeout, retry")
-                    time.sleep(0.1)
-                    continue
-                else:
-                    traceback.print_exc(file=sys.stdout)
-                    raise e
 
 
 class QueuePipe: