Initial patch by Serhiy Storchaka.
try:
port = int(port)
except ValueError:
-- raise socket.error("nonnumeric port")
++ raise OSError("nonnumeric port")
if not port:
port = self.default_port
if self.debuglevel > 0:
s = s.encode("ascii")
try:
self.sock.sendall(s)
-- except socket.error:
++ except OSError:
self.close()
raise SMTPServerDisconnected('Server not connected')
else:
while 1:
try:
line = self.file.readline()
-- except socket.error as e:
++ except OSError as e:
self.close()
raise SMTPServerDisconnected("Connection unexpectedly closed: "
+ str(e))
self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.file = None
self.sock.connect(host)
- except socket.error as msg:
- except socket.error:
++ except OSError:
if self.debuglevel > 0:
print('connect fail:', host, file=stderr)
if self.sock:
return ""
--class gaierror(Exception):
-- pass
--
--
--class error(Exception):
-- pass
++gaierror = socket_module.gaierror
++error = socket_module.error
# Constants
def testNonnumericPort(self):
# check that non-numeric port raises socket.error
-- self.assertRaises(mock_socket.error, smtplib.SMTP,
++ self.assertRaises(OSError, smtplib.SMTP,
"localhost", "bogus")
-- self.assertRaises(mock_socket.error, smtplib.SMTP,
++ self.assertRaises(OSError, smtplib.SMTP,
"localhost:bogus")