/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Vincent Ladeuil
  • Date: 2009-10-08 09:03:00 UTC
  • mto: (5247.1.1 first-try)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20091008090300-f1uy74ok3krwd7q0
Refactor compatibility code for python-2.[45].

* bzrlib/tests/http_server.py:
(TestingHTTPServerMixin, TestingHTTPServer.server_bind,
TestingThreadingHTTPServer.server_bind): Reduce duplication.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
323
323
        self.serving = False
324
324
        self.is_shut_down = threading.Event()
325
325
 
 
326
    def server_bind(self):
 
327
        # The following has been fixed in 2.5 so we need to provide it for
 
328
        # older python versions.
 
329
        if sys.version < (2, 5):
 
330
            self.server_address = self.socket.getsockname()
 
331
 
326
332
    def serve(self):
327
333
        self.serving = True
328
334
        self.is_shut_down.clear()
415
421
 
416
422
    def server_bind(self):
417
423
        SocketServer.TCPServer.server_bind(self)
418
 
        if sys.version < (2, 5):
419
 
            self.server_address = self.socket.getsockname()
 
424
        TestingHTTPServerMixin.server_bind(self)
420
425
 
421
426
 
422
427
class TestingThreadingHTTPServer(TestingHTTPServerMixin,
462
467
 
463
468
    def server_bind(self):
464
469
        SocketServer.ThreadingTCPServer.server_bind(self)
465
 
        if sys.version < (2, 5):
466
 
            self.server_address = self.socket.getsockname()
 
470
        TestingHTTPServerMixin.server_bind(self)
467
471
 
468
472
 
469
473
class HttpServer(transport.Server):