This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3956

mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
ClosedPublic

Authored by durin42 on Jul 16 2018, 7:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa5e70c14214a: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile
Summary

They're equivalent, and the latter is what Python 3.3 says to use in
the release notes. Turns out it works on Python 2 as well.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Jul 16 2018, 7:16 PM
yuja added a subscriber: yuja.Jul 17 2018, 9:25 AM
  • self.file = smtplib.SSLFakeFile(new_socket)

+ self.file = new_socket.makefile()

I'm not pretty sure, but missing 'rb'?

durin42 updated this revision to Diff 10192.Aug 9 2018, 4:43 PM
durin42 updated this revision to Diff 10196.Aug 9 2018, 4:48 PM
Closed by commit rHGa5e70c14214a: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile (authored by durin42). · Explain WhyAug 9 2018, 11:02 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/mail.py (2 lines)

Diff 10196

mercurial/mail.py

def _get_socket(self, host, port, timeout): def _get_socket(self, host, port, timeout):
if self.debuglevel > 0: if self.debuglevel > 0:
self._ui.debug('connect: %r\n' % (host, port)) self._ui.debug('connect: %r\n' % (host, port))
new_socket = socket.create_connection((host, port), timeout) new_socket = socket.create_connection((host, port), timeout)
new_socket = sslutil.wrapsocket(new_socket, new_socket = sslutil.wrapsocket(new_socket,
self.keyfile, self.certfile, self.keyfile, self.certfile,
ui=self._ui, ui=self._ui,
serverhostname=self._host) serverhostname=self._host)
self.file = smtplib.SSLFakeFile(new_socket) self.file = new_socket.makefile(r'rb')
return new_socket return new_socket
def _pyhastls(): def _pyhastls():
"""Returns true iff Python has TLS support, false otherwise.""" """Returns true iff Python has TLS support, false otherwise."""
try: try:
import ssl import ssl
getattr(ssl, 'HAS_TLS', False) getattr(ssl, 'HAS_TLS', False)
return True return True