Rev 4738: Refactor compatibility code for python-2.[45]. in file:///home/vila/src/bzr/bugs/392127-thread-leak/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/392127-thread-leak/

------------------------------------------------------------
revno: 4738
revision-id: v.ladeuil+lp at free.fr-20091008090300-f1uy74ok3krwd7q0
parent: v.ladeuil+lp at free.fr-20091008085517-gbybgf4dszqq31lj
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 392127-thread-leak
timestamp: Thu 2009-10-08 11:03:00 +0200
message:
  Refactor compatibility code for python-2.[45].
  
  * bzrlib/tests/http_server.py:
  (TestingHTTPServerMixin, TestingHTTPServer.server_bind,
  TestingThreadingHTTPServer.server_bind): Reduce duplication.
-------------- next part --------------
=== modified file 'bzrlib/tests/http_server.py'
--- a/bzrlib/tests/http_server.py	2009-10-08 08:55:17 +0000
+++ b/bzrlib/tests/http_server.py	2009-10-08 09:03:00 +0000
@@ -323,6 +323,12 @@
         self.serving = False
         self.is_shut_down = threading.Event()
 
+    def server_bind(self):
+        # The following has been fixed in 2.5 so we need to provide it for
+        # older python versions.
+        if sys.version < (2, 5):
+            self.server_address = self.socket.getsockname()
+
     def serve(self):
         self.serving = True
         self.is_shut_down.clear()
@@ -415,8 +421,7 @@
 
     def server_bind(self):
         SocketServer.TCPServer.server_bind(self)
-        if sys.version < (2, 5):
-            self.server_address = self.socket.getsockname()
+        TestingHTTPServerMixin.server_bind(self)
 
 
 class TestingThreadingHTTPServer(TestingHTTPServerMixin,
@@ -462,8 +467,7 @@
 
     def server_bind(self):
         SocketServer.ThreadingTCPServer.server_bind(self)
-        if sys.version < (2, 5):
-            self.server_address = self.socket.getsockname()
+        TestingHTTPServerMixin.server_bind(self)
 
 
 class HttpServer(transport.Server):