commit 2ade6f24cb4ac21b9da36b0e1ce7414463c9f5d5
author Andrew Svetlov <andrew.svetlov@gmail.com> Mon Dec 17 18:57:16 2012 +0200
committer Andrew Svetlov <andrew.svetlov@gmail.com> Mon Dec 17 18:57:16 2012 +0200
tree b11f2f094692b1189522f6d08619eb7b99028d50
parent df485ca493b52dd8f1848794b5a58e3c3d8e92b1
parent 3b69824de9860899372d3b816a0601889e2a0031

Issue #16647: save socket error details in LMTP.connect()

Initial patch by Serhiy Storchaka.

Lib/test/mock_socket.py

diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py
index d09e78c..8ef0ec8 100644
--- a/Lib/test/mock_socket.py
+++ b/Lib/test/mock_socket.py
@@ -140,12 +140,8 @@
     return ""
 
 
-class gaierror(Exception):
-    pass
-
-
-class error(Exception):
-    pass
+gaierror = socket_module.gaierror
+error = socket_module.error
 
 
 # Constants

Lib/test/test_smtplib.py

diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index befc49e..6fe2df9 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -542,9 +542,9 @@
 
     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")