diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-13 19:50:37 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-13 19:50:37 (GMT) |
| commit | 4fd55ca5258d445c727d7eb1218cc377071c38e2 (patch) | |
| tree | ae56c08a9b2e1dd1669f57581cea791daf03f126 /Lib/socketserver.py | |
| parent | 157da6fdd27ba56ee298f24def28f8093d989580 (diff) | |
| parent | 0f4f048fa5ff06438a4624bc1dc02aa458a79748 (diff) | |
| download | cpython-4fd55ca5258d445c727d7eb1218cc377071c38e2.zip cpython-4fd55ca5258d445c727d7eb1218cc377071c38e2.tar.gz cpython-4fd55ca5258d445c727d7eb1218cc377071c38e2.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/socketserver.py')
| -rw-r--r-- | Lib/socketserver.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 2f395fa..7339911 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -426,8 +426,12 @@ class TCPServer(BaseServer): self.socket = socket.socket(self.address_family, self.socket_type) if bind_and_activate: - self.server_bind() - self.server_activate() + try: + self.server_bind() + self.server_activate() + except: + self.server_close() + raise def server_bind(self): """Called by constructor to bind the socket. |