Issue #16717: get rid of socket.error, replace with OSError
diff --git a/Lib/ftplib.py b/Lib/ftplib.py
index 5efae95..2641a1d 100644
--- a/Lib/ftplib.py
+++ b/Lib/ftplib.py
@@ -123,7 +123,7 @@
if self.sock is not None:
try:
self.quit()
- except (socket.error, EOFError):
+ except (OSError, EOFError):
pass
finally:
if self.sock is not None:
@@ -295,7 +295,7 @@
try:
sock = socket.socket(af, socktype, proto)
sock.bind(sa)
- except socket.error as _:
+ except OSError as _:
err = _
if sock:
sock.close()
@@ -306,8 +306,8 @@
if err is not None:
raise err
else:
- raise socket.error("getaddrinfo returns an empty list")
- raise socket.error(msg)
+ raise OSError("getaddrinfo returns an empty list")
+ raise OSError(msg)
sock.listen(1)
port = sock.getsockname()[1] # Get proper port
host = self.sock.getsockname()[0] # Get proper host