diff -r 0238cc842805 Lib/smtplib.py
--- a/Lib/smtplib.py	Thu Dec 06 17:49:58 2012 -0500
+++ b/Lib/smtplib.py	Sat Dec 08 21:07:08 2012 +0200
@@ -920,13 +920,13 @@
             self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             self.file = None
             self.sock.connect(host)
-        except socket.error as msg:
+        except OSError as err:
             if self.debuglevel > 0:
                 print('connect fail:', host, file=stderr)
             if self.sock:
                 self.sock.close()
             self.sock = None
-            raise socket.error(msg)
+            raise err from None
         (code, msg) = self.getreply()
         if self.debuglevel > 0:
             print('connect:', msg, file=stderr)