Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/mail.py @ 18916:6edb0e18b83c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mail: add missing import of sys Found using Cython.
author Bryan O'Sullivan <bryano@fb.com>
date Fri, 12 Apr 2013 17:17:35 -0700
parents 19d489404d79
children 601c1e226889
comparison
equal deleted inserted replaced
18915:169030d9255e 18916:6edb0e18b83c
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from i18n import _ 8 from i18n import _
9 import util, encoding, sslutil 9 import util, encoding, sslutil
10 import os, smtplib, socket, quopri, time 10 import os, smtplib, socket, quopri, time, sys
11 import email.Header, email.MIMEText, email.Utils 11 import email.Header, email.MIMEText, email.Utils
12 12
13 _oldheaderinit = email.Header.Header.__init__ 13 _oldheaderinit = email.Header.Header.__init__
14 def _unifiedheaderinit(self, *args, **kw): 14 def _unifiedheaderinit(self, *args, **kw):
15 """ 15 """
70 self.default_port = smtplib.SMTP_SSL_PORT 70 self.default_port = smtplib.SMTP_SSL_PORT
71 self._sslkwargs = sslkwargs 71 self._sslkwargs = sslkwargs
72 72
73 def _get_socket(self, host, port, timeout): 73 def _get_socket(self, host, port, timeout):
74 if self.debuglevel > 0: 74 if self.debuglevel > 0:
75 print >> stderr, 'connect:', (host, port) 75 print >> sys.stderr, 'connect:', (host, port)
76 new_socket = socket.create_connection((host, port), timeout) 76 new_socket = socket.create_connection((host, port), timeout)
77 new_socket = sslutil.ssl_wrap_socket(new_socket, 77 new_socket = sslutil.ssl_wrap_socket(new_socket,
78 self.keyfile, self.certfile, 78 self.keyfile, self.certfile,
79 **self._sslkwargs) 79 **self._sslkwargs)
80 self.file = smtplib.SSLFakeFile(new_socket) 80 self.file = smtplib.SSLFakeFile(new_socket)