summaryrefslogtreecommitdiffstats
path: root/Lib/smtplib.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2001-07-26 13:37:33 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2001-07-26 13:37:33 (GMT)
commit4eb5940a4d350d250ab4af08a8b5b6e553e1814d (patch)
treeb3d063c4d166a00f994bf64a80921553b15f1740 /Lib/smtplib.py
parent2e441f7836134c475e35eea4a005f19699703a9b (diff)
downloadcpython-4eb5940a4d350d250ab4af08a8b5b6e553e1814d.zip
cpython-4eb5940a4d350d250ab4af08a8b5b6e553e1814d.tar.gz
cpython-4eb5940a4d350d250ab4af08a8b5b6e553e1814d.tar.bz2
Untabify IPv6 changes.
Diffstat (limited to 'Lib/smtplib.py')
-rwxr-xr-xLib/smtplib.py32
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
index fde6c69..27cda40 100755
--- a/Lib/smtplib.py
+++ b/Lib/smtplib.py
@@ -208,7 +208,7 @@ class SMTP:
specified during instantiation.
"""
- if not port and (host.find(':') == host.rfind(':')):
+ if not port and (host.find(':') == host.rfind(':')):
i = host.rfind(':')
if i >= 0:
host, port = host[:i], host[i+1:]
@@ -216,21 +216,21 @@ class SMTP:
except ValueError:
raise socket.error, "nonnumeric port"
if not port: port = SMTP_PORT
- if self.debuglevel > 0: print 'connect:', (host, port)
- for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
- af, socktype, proto, canonname, sa = res
- try:
- self.sock = socket.socket(af, socktype, proto)
- if self.debuglevel > 0: print 'connect:', (host, port)
- self.sock.connect(sa)
- except socket.error, msg:
- if self.debuglevel > 0: print 'connect fail:', (host, port)
- self.sock.close()
- self.sock = None
- continue
- break
- if not self.sock:
- raise socket.error, msg
+ if self.debuglevel > 0: print 'connect:', (host, port)
+ for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+ af, socktype, proto, canonname, sa = res
+ try:
+ self.sock = socket.socket(af, socktype, proto)
+ if self.debuglevel > 0: print 'connect:', (host, port)
+ self.sock.connect(sa)
+ except socket.error, msg:
+ if self.debuglevel > 0: print 'connect fail:', (host, port)
+ self.sock.close()
+ self.sock = None
+ continue
+ break
+ if not self.sock:
+ raise socket.error, msg
(code, msg) = self.getreply()
if self.debuglevel > 0: print "connect:", msg
return (code, msg)