summaryrefslogtreecommitdiff
path: root/src/mailman/runners
diff options
context:
space:
mode:
authorBarry Warsaw2016-11-24 12:40:49 -0500
committerBarry Warsaw2016-11-24 12:40:49 -0500
commit3552dffc343d098c9baa7d4985ca60e4bb13b9f2 (patch)
tree6d209908c6d18fdbd2747d362dbb9f9e5b6b4a8a /src/mailman/runners
parent0a03fce091e190e15e593dd1a7d1fd0cfac44793 (diff)
downloadmailman-3552dffc343d098c9baa7d4985ca60e4bb13b9f2.tar.gz
mailman-3552dffc343d098c9baa7d4985ca60e4bb13b9f2.tar.zst
mailman-3552dffc343d098c9baa7d4985ca60e4bb13b9f2.zip
Use aiosmtpd 1.0a3 and add NEWS.
Diffstat (limited to 'src/mailman/runners')
-rw-r--r--src/mailman/runners/lmtp.py17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/mailman/runners/lmtp.py b/src/mailman/runners/lmtp.py
index 9dbe07e25..21fb44c5e 100644
--- a/src/mailman/runners/lmtp.py
+++ b/src/mailman/runners/lmtp.py
@@ -35,6 +35,7 @@ so that the peer mail server can provide better diagnostics.
"""
import email
+import socket
import logging
import aiosmtpd
import aiosmtpd.smtp
@@ -215,26 +216,14 @@ class LMTPHandler:
return CRLF.join(status)
-import socket
-import asyncio
-
-
class LMTPController(Controller):
def factory(self):
return LMTP(self.handler)
- def _run(self, ready_event):
+ def make_socket(self):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, True)
- sock.bind((self.hostname, self.port))
- asyncio.set_event_loop(self.loop)
- server = self.loop.run_until_complete(
- self.loop.create_server(self.factory, sock=sock))
- self.loop.call_soon(ready_event.set)
- self.loop.run_forever()
- server.close()
- self.loop.run_until_complete(server.wait_closed())
- self.loop.close()
+ return sock
@public