socket.error/IOError -> OSError

10 files changed, 33 insertions, 33 deletions

diff --git a/src/waitress/channel.py b/src/waitress/channel.py
index dfb36bb..3430481 100644
--- a/src/waitress/channel.py
+++ b/src/waitress/channel.py
@@ -116,7 +116,7 @@ class HTTPChannel(wasyncore.dispatcher):
         if flush:
             try:
                 flush()
-            except socket.error:
+            except OSError:
                 if self.adj.log_socket_errors:
                     self.logger.exception("Socket error")
                 self.will_close = True
@@ -142,7 +142,7 @@ class HTTPChannel(wasyncore.dispatcher):
     def handle_read(self):
         try:
             data = self.recv(self.adj.recv_bytes)
-        except socket.error:
+        except OSError:
             if self.adj.log_socket_errors:
                 self.logger.exception("Socket error")
             self.handle_close()
diff --git a/src/waitress/server.py b/src/waitress/server.py
index 02a6668..a5a246c 100644
--- a/src/waitress/server.py
+++ b/src/waitress/server.py
@@ -260,7 +260,7 @@ class BaseWSGIServer(wasyncore.dispatcher):
         if server_name == "0.0.0.0" or server_name == "::":
             try:
                 return str(self.socketmod.gethostname())
-            except (socket.error, UnicodeDecodeError):  # pragma: no cover
+            except (OSError, UnicodeDecodeError):  # pragma: no cover
                 # We also deal with UnicodeDecodeError in case of Windows with
                 # non-ascii hostname
                 return "localhost"
@@ -268,7 +268,7 @@ class BaseWSGIServer(wasyncore.dispatcher):
         # Now let's try and convert the IP address to a proper hostname
         try:
             server_name = self.socketmod.gethostbyaddr(server_name)[0]
-        except (socket.error, UnicodeDecodeError):  # pragma: no cover
+        except (OSError, UnicodeDecodeError):  # pragma: no cover
             # We also deal with UnicodeDecodeError in case of Windows with
             # non-ascii hostname
             pass
@@ -312,7 +312,7 @@ class BaseWSGIServer(wasyncore.dispatcher):
             if v is None:
                 return
             conn, addr = v
-        except socket.error:
+        except OSError:
             # Linux: On rare occasions we get a bogus socket back from
             # accept.  socketmodule.c:makesockaddr complains that the
             # address family is unknown.  We don't want the whole server
diff --git a/src/waitress/task.py b/src/waitress/task.py
index 6ab6bfe..1e30839 100644
--- a/src/waitress/task.py
+++ b/src/waitress/task.py
@@ -170,7 +170,7 @@ class Task:
                 self.start()
                 self.execute()
                 self.finish()
-            except socket.error:
+            except OSError:
                 self.close_on_finish = True
                 if self.channel.adj.log_socket_errors:
                     raise
diff --git a/src/waitress/trigger.py b/src/waitress/trigger.py
index 10ee185..09c291e 100644
--- a/src/waitress/trigger.py
+++ b/src/waitress/trigger.py
@@ -98,7 +98,7 @@ class _triggerbase:
     def handle_read(self):
         try:
             self.recv(8192)
-        except (OSError, socket.error):
+        except OSError:
             return
         with self.lock:
             for thunk in self.thunks:
@@ -173,7 +173,7 @@ else:  # pragma: no cover
                 try:
                     w.connect(connect_address)
                     break  # success
-                except socket.error as detail:
+                except OSError as detail:
                     if detail[0] != errno.WSAEADDRINUSE:
                         # "Address already in use" is the only error
                         # I've seen on two WinXP Pro SP2 boxes, under
diff --git a/src/waitress/wasyncore.py b/src/waitress/wasyncore.py
index 09bcafa..ae9a6a9 100644
--- a/src/waitress/wasyncore.py
+++ b/src/waitress/wasyncore.py
@@ -138,7 +138,7 @@ def readwrite(obj, flags):
             obj.handle_expt_event()
         if flags & (select.POLLHUP | select.POLLERR | select.POLLNVAL):
             obj.handle_close()
-    except socket.error as e:
+    except OSError as e:
         if e.args[0] not in _DISCONNECTED:
             obj.handle_error()
         else:
@@ -172,7 +172,7 @@ def poll(timeout=0.0, map=None):
 
         try:
             r, w, e = select.select(r, w, e, timeout)
-        except select.error as err:
+        except OSError as err:
             if err.args[0] != EINTR:
                 raise
             else:
@@ -218,7 +218,7 @@ def poll2(timeout=0.0, map=None):
 
         try:
             r = pollster.poll(timeout)
-        except select.error as err:
+        except OSError as err:
             if err.args[0] != EINTR:
                 raise
             r = []
@@ -305,7 +305,7 @@ class dispatcher:
             # passed be connected.
             try:
                 self.addr = sock.getpeername()
-            except socket.error as err:
+            except OSError as err:
                 if err.args[0] in (ENOTCONN, EINVAL):
                     # To handle the case where we got an unconnected
                     # socket.
@@ -368,7 +368,7 @@ class dispatcher:
                 socket.SO_REUSEADDR,
                 self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) | 1,
             )
-        except socket.error:
+        except OSError:
             pass
 
     # ==================================================
@@ -412,7 +412,7 @@ class dispatcher:
             self.addr = address
             self.handle_connect_event()
         else:
-            raise socket.error(err, errorcode[err])
+            raise OSError(err, errorcode[err])
 
     def accept(self):
         # XXX can return either an address pair or None
@@ -420,7 +420,7 @@ class dispatcher:
             conn, addr = self.socket.accept()
         except TypeError:
             return None
-        except socket.error as why:
+        except OSError as why:
             if why.args[0] in (EWOULDBLOCK, ECONNABORTED, EAGAIN):
                 return None
             else:
@@ -432,7 +432,7 @@ class dispatcher:
         try:
             result = self.socket.send(data)
             return result
-        except socket.error as why:
+        except OSError as why:
             if why.args[0] == EWOULDBLOCK:
                 return 0
             elif why.args[0] in _DISCONNECTED:
@@ -451,7 +451,7 @@ class dispatcher:
                 return b""
             else:
                 return data
-        except socket.error as why:
+        except OSError as why:
             # winsock sometimes raises ENOTCONN
             if why.args[0] in _DISCONNECTED:
                 self.handle_close()
@@ -467,7 +467,7 @@ class dispatcher:
         if self.socket is not None:
             try:
                 self.socket.close()
-            except socket.error as why:
+            except OSError as why:
                 if why.args[0] not in (ENOTCONN, EBADF):
                     raise
 
@@ -501,7 +501,7 @@ class dispatcher:
     def handle_connect_event(self):
         err = self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
         if err != 0:
-            raise socket.error(err, _strerror(err))
+            raise OSError(err, _strerror(err))
         self.handle_connect()
         self.connected = True
         self.connecting = False
@@ -608,7 +608,7 @@ def close_all(map=None, ignore_all=False):
     for x in list(map.values()):  # list() FBO py3
         try:
             x.close()
-        except socket.error as x:
+        except OSError as x:
             if x.args[0] == EBADF:
                 pass
             elif not ignore_all:
diff --git a/tests/test_channel.py b/tests/test_channel.py
index 1b119b9..a8102fc 100644
--- a/tests/test_channel.py
+++ b/tests/test_channel.py
@@ -195,7 +195,7 @@ class TestHTTPChannel(unittest.TestCase):
         inst.will_close = False
 
         def recv(b):
-            raise socket.error
+            raise OSError
 
         inst.recv = recv
         inst.last_activity = 0
diff --git a/tests/test_functional.py b/tests/test_functional.py
index d8e60a4..f92faaf 100644
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -1531,7 +1531,7 @@ if hasattr(socket, "AF_UNIX"):
             # 'Broken pipe' error when the socket it closed.
             try:
                 self.sock.send(to_send)
-            except socket.error as exc:
+            except OSError as exc:
                 self.assertEqual(get_errno(exc), errno.EPIPE)
 
     class UnixEchoTests(EchoTests, UnixTests, unittest.TestCase):
@@ -1602,7 +1602,7 @@ class ConnectionClosed(Exception):
 def read_http(fp):  # pragma: no cover
     try:
         response_line = fp.readline()
-    except socket.error as exc:
+    except OSError as exc:
         fp.close()
         # errno 104 is ENOTRECOVERABLE, In WinSock 10054 is ECONNRESET
         if get_errno(exc) in (errno.ECONNABORTED, errno.ECONNRESET, 104, 10054):
diff --git a/tests/test_server.py b/tests/test_server.py
index 857ba8f..7242aa7 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -240,7 +240,7 @@ class TestWSGIServer(unittest.TestCase):
         inst.adj = DummyAdj
 
         def foo():
-            raise socket.error
+            raise OSError
 
         inst.accept = foo
         inst.logger = DummyLogger()
diff --git a/tests/test_task.py b/tests/test_task.py
index 10b0344..9c170bb 100644
--- a/tests/test_task.py
+++ b/tests/test_task.py
@@ -400,7 +400,7 @@ class TestWSGITask(unittest.TestCase):
         inst = self._makeOne()
 
         def execute():
-            raise socket.error
+            raise OSError
 
         inst.execute = execute
         self.assertRaises(socket.error, inst.service)
diff --git a/tests/test_wasyncore.py b/tests/test_wasyncore.py
index d7c8ed3..df896db 100644
--- a/tests/test_wasyncore.py
+++ b/tests/test_wasyncore.py
@@ -401,7 +401,7 @@ def _is_ipv6_enabled():  # pragma: no cover
             sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
             sock.bind(("::1", 0))
             return True
-        except socket.error:
+        except OSError:
             pass
         finally:
             if sock:
@@ -1420,7 +1420,7 @@ class Test_dispatcher(unittest.TestCase):
         sock = dummysocket()
 
         def getpeername():
-            raise socket.error(errno.EBADF)
+            raise OSError(errno.EBADF)
 
         map = {}
         sock.getpeername = getpeername
@@ -1454,7 +1454,7 @@ class Test_dispatcher(unittest.TestCase):
 
         def setsockopt(*arg, **kw):
             sock.errored = True
-            raise socket.error
+            raise OSError
 
         sock.setsockopt = setsockopt
         sock.getsockopt = lambda *arg: 0
@@ -1486,7 +1486,7 @@ class Test_dispatcher(unittest.TestCase):
         map = {}
 
         def accept(*arg, **kw):
-            raise socket.error(122)
+            raise OSError(122)
 
         sock.accept = accept
         inst = self._makeOne(sock=sock, map=map)
@@ -1497,7 +1497,7 @@ class Test_dispatcher(unittest.TestCase):
         map = {}
 
         def send(*arg, **kw):
-            raise socket.error(errno.EWOULDBLOCK)
+            raise OSError(errno.EWOULDBLOCK)
 
         sock.send = send
         inst = self._makeOne(sock=sock, map=map)
@@ -1509,7 +1509,7 @@ class Test_dispatcher(unittest.TestCase):
         map = {}
 
         def send(*arg, **kw):
-            raise socket.error(122)
+            raise OSError(122)
 
         sock.send = send
         inst = self._makeOne(sock=sock, map=map)
@@ -1520,7 +1520,7 @@ class Test_dispatcher(unittest.TestCase):
         map = {}
 
         def recv(*arg, **kw):
-            raise socket.error(errno.ECONNRESET)
+            raise OSError(errno.ECONNRESET)
 
         def handle_close():
             inst.close_handled = True
@@ -1537,7 +1537,7 @@ class Test_dispatcher(unittest.TestCase):
         map = {}
 
         def close():
-            raise socket.error(122)
+            raise OSError(122)
 
         sock.close = close
         inst = self._makeOne(sock=sock, map=map)