diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2009-05-23 00:48:58 (GMT) |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2009-05-23 00:48:58 (GMT) |
| commit | ad3058e0b8ef8a2f753195e9611b47c01c4f3b0d (patch) | |
| tree | e2f96416103f5ed6d52ef017a402a08c3ba3fbe6 /Lib/smtplib.py | |
| parent | eae1b28fb128056144d05892eb2e9f10b4a34cfb (diff) | |
| download | cpython-ad3058e0b8ef8a2f753195e9611b47c01c4f3b0d.zip cpython-ad3058e0b8ef8a2f753195e9611b47c01c4f3b0d.tar.gz cpython-ad3058e0b8ef8a2f753195e9611b47c01c4f3b0d.tar.bz2 | |
Fix Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns
the socket. Patch by Farhan Ahmad, test by Marcin Bachry.
Diffstat (limited to 'Lib/smtplib.py')
| -rwxr-xr-x | Lib/smtplib.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 69d7f71..9300474 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -754,9 +754,10 @@ 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) - self.sock = ssl.wrap_socket(self.sock, self.keyfile, self.certfile) - self.file = SSLFakeFile(self.sock) + new_socket = socket.create_connection((host, port), timeout) + new_socket = ssl.wrap_socket(new_socket, self.keyfile, self.certfile) + self.file = SSLFakeFile(new_socket) + return new_socket __all__.append("SMTP_SSL") |