/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-12 15:48:25 UTC
  • mto: (4731.2.15 392127-thread-leak)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20091012154825-wm80yyjc2pd4mjrn
Fixed as per Andrew's review.

* bzrlib/tests/http_server.py:
(TestingHTTPServerMixin.connect_socket): Be less dirty to handle
the socket errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
343
343
        self.is_shut_down.set()
344
344
 
345
345
    def connect_socket(self):
346
 
        msg = "getaddrinfo returns an empty list"
 
346
        err = socket.error('getaddrinfo returns an empty list')
347
347
        for res in socket.getaddrinfo(*self.server_address):
348
348
            af, socktype, proto, canonname, sa = res
349
349
            sock = None
352
352
                sock.connect(sa)
353
353
                return sock
354
354
 
355
 
            except socket.error, msg:
 
355
            except socket.error, err:
 
356
                # 'err' is now the most recent error
356
357
                if sock is not None:
357
358
                    sock.close()
358
 
        raise socket.error, msg
 
359
        raise err
359
360
 
360
361
    def shutdown(self):
361
362
        """Stops the serve() loop.