SMTPServer.__init__(): The asyncore.dispatcher base class has a method

set_reuse_addr() that does the setsockopt fiddling.  Use it instead.

diff --git a/Lib/smtpd.py b/Lib/smtpd.py
index 9406de14dd4b554b64742c29dc310e4a57e631a2..cf6821f2ba901b43e44a76011e94a545dff5ecb6 100755 (executable)
--- a/Lib/smtpd.py
+++ b/Lib/smtpd.py
@@ -277,9 +277,7 @@ class SMTPServer(asyncore.dispatcher):
         asyncore.dispatcher.__init__(self)
         self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
         # try to re-use a server port if possible
-        self.socket.setsockopt(
-            socket.SOL_SOCKET, socket.SO_REUSEADDR,
-            self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) | 1)
+        self.set_reuse_addr()
         self.bind(localaddr)
         self.listen(5)
         print >> DEBUGSTREAM, \