/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 08:55:17 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-20091008085517-gbybgf4dszqq31lj
Fix python-2.4/2.5 compatibility.

* bzrlib/tests/test_http.py:
(RecordingServer.connect_socket): Band aid to work around
python-2.4 missing socket.create_connection().

* bzrlib/tests/http_server.py:
(TestingThreadingHTTPServer.process_request_thread): Fix
python2.5/2.4 compatibility.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
443
443
        self.clients = []
444
444
 
445
445
    def process_request_thread(self, request, client_address):
446
 
        self.clients.append((request, threading.current_thread()))
 
446
        self.clients.append((request, threading.currentThread()))
447
447
        try:
448
448
            SocketServer.ThreadingTCPServer.process_request_thread(
449
449
                self, request, client_address)