From 22c42ba88c7b28d4840078672bc7cefc75b95f71 Mon Sep 17 00:00:00 2001 From: Collin Winter Date: Sat, 10 Mar 2007 02:51:26 +0000 Subject: Bug #1531963: Make SocketServer.TCPServer's server_address always be equal to calling getsockname() on the server's socket. Will backport. --- Lib/SocketServer.py | 1 + Lib/test/test_socketserver.py | 1 + Misc/NEWS | 3 +++ 3 files changed, 5 insertions(+) diff --git a/Lib/SocketServer.py b/Lib/SocketServer.py index 3a74c44..7d9b9a5 100644 --- a/Lib/SocketServer.py +++ b/Lib/SocketServer.py @@ -339,6 +339,7 @@ class TCPServer(BaseServer): if self.allow_reuse_address: self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) self.socket.bind(self.server_address) + self.server_address = self.socket.getsockname() def server_activate(self): """Called by constructor to activate the server. diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index e4cbb2b..6232175 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -84,6 +84,7 @@ class ServerThread(threading.Thread): addr = getattr(svr, 'server_address') if addr: self.__addr = addr + assert self.__addr == svr.socket.getsockname() if verbose: print "thread: serving three times" svr.serve_a_few() if verbose: print "thread: done" diff --git a/Misc/NEWS b/Misc/NEWS index ef54039..262972c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -156,6 +156,9 @@ Core and builtins Library ------- +- Bug #1531963: Make SocketServer.TCPServer's server_address always + be equal to calling getsockname() on the server's socket. + - Bug #1651235: When a tuple was passed to a ctypes function call, Python would crash instead of raising an error. -- cgit v0.12