From c8f6c23b0bef262216ec5385013e737c387d7fa1 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sat, 10 Mar 2007 03:19:18 +0000 Subject: Simplify a little by handling the TCP case first. Update to use predominant style of spaces around = in args list and print to stderr if debugging. --- Lib/smtplib.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Lib/smtplib.py b/Lib/smtplib.py index 5f70b10..850c06a 100755 --- a/Lib/smtplib.py +++ b/Lib/smtplib.py @@ -771,25 +771,25 @@ class LMTP(SMTP): """Initialize a new instance.""" SMTP.__init__(self, host, port, local_hostname) - def connect(self, host='localhost', port = 0): + def connect(self, host = 'localhost', port = 0): """Connect to the LMTP daemon, on either a Unix or a TCP socket.""" - if host[0] == '/': - try: - self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - self.sock.connect(host) - except socket.error, msg: - if self.debuglevel > 0: print 'connect fail:', host - if self.sock: - self.sock.close() - self.sock = None - if not self.sock: - raise socket.error, msg - (code, msg) = self.getreply() - if self.debuglevel > 0: print "connect:", msg - return (code, msg) - else: + if host[0] != '/': return SMTP.connect(self, host, port) + # Handle Unix-domain sockets. + try: + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + self.sock.connect(host) + except socket.error, msg: + if self.debuglevel > 0: print>>stderr, 'connect fail:', host + if self.sock: + self.sock.close() + self.sock = None + raise socket.error, msg + (code, msg) = self.getreply() + if self.debuglevel > 0: print>>stderr, "connect:", msg + return (code, msg) + # Test the sendmail method, which tests most of the others. # Note: This always sends to localhost. -- cgit v0.12