diff options
| -rwxr-xr-x | Lib/smtpd.py | 21 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 16 insertions, 8 deletions
diff --git a/Lib/smtpd.py b/Lib/smtpd.py index 3dc9793..76df673 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -274,14 +274,19 @@ class SMTPServer(asyncore.dispatcher): self._localaddr = localaddr self._remoteaddr = remoteaddr asyncore.dispatcher.__init__(self) - self.create_socket(socket.AF_INET, socket.SOCK_STREAM) - # try to re-use a server port if possible - self.set_reuse_addr() - self.bind(localaddr) - self.listen(5) - print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( - self.__class__.__name__, time.ctime(time.time()), - localaddr, remoteaddr), file=DEBUGSTREAM) + try: + self.create_socket(socket.AF_INET, socket.SOCK_STREAM) + # try to re-use a server port if possible + self.set_reuse_addr() + self.bind(localaddr) + self.listen(5) + except: + self.close() + raise + else: + print('%s started at %s\n\tLocal addr: %s\n\tRemote addr:%s' % ( + self.__class__.__name__, time.ctime(time.time()), + localaddr, remoteaddr), file=DEBUGSTREAM) def handle_accept(self): conn, addr = self.accept() @@ -67,6 +67,9 @@ C-API Library ------- +- Issue #6589: cleanup asyncore.socket_map in case smtpd.SMTPServer constructor + raises an exception. + - Issue #9075: In the ssl module, remove the setting of a ``debug`` flag on an OpenSSL structure. |