From: Bill Janssen <janssen@parc.com>
Date: Fri, 31 Aug 2007 19:03:31 +0000 (+0000)
Subject: remove use of non-existent SSLFakeSocket in apparently untested code
X-Git-Tag: v2.6a1~1366
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=470dcd261174a35e24459260938e991606c5d87b;p=python

remove use of non-existent SSLFakeSocket in apparently untested code
---

diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index 5b2c6a013a..529984833b 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -162,7 +162,6 @@ try:
 except ImportError:
     _have_ssl = False
 else:
-
     class SSLFakeFile:
         """A fake file like object that really wraps a SSLObject.
 
@@ -721,9 +720,8 @@ if _have_ssl:
         def _get_socket(self, host, port, timeout):
             if self.debuglevel > 0: print>>stderr, 'connect:', (host, port)
             self.sock = socket.create_connection((host, port), timeout)
-            sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
-            self.sock = SSLFakeSocket(self.sock, sslobj)
-            self.file = SSLFakeFile(sslobj)
+            self.sock = ssl.sslsocket(self.sock, self.keyfile, self.certfile)
+            self.file = SSLFakeFile(self.sock)
 
     __all__.append("SMTP_SSL")