Mercurial > hg-stable

changeset 26807:df31e126b706

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mail: drop python 2.5 self.sock.read workaround
author timeless <timeless@mozdev.org>
date Thu, 15 Oct 2015 17:24:42 -0400
parents ec12ebe20200
children b81b8dbecc26
files mercurial/mail.py
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/mail.py	Thu Oct 15 17:21:08 2015 -0400
+++ b/mercurial/mail.py	Thu Oct 15 17:24:42 2015 -0400
@@ -60,9 +60,6 @@
         if resp == 220:
             self.sock = sslutil.wrapsocket(self.sock, keyfile, certfile,
                                            **self._sslkwargs)
-            if not util.safehasattr(self.sock, "read"):
-                # using httplib.FakeSocket with Python 2.5.x or earlier
-                self.sock.read = self.sock.recv
             self.file = smtplib.SSLFakeFile(self.sock)
             self.helo_resp = None
             self.ehlo_resp = None