Rev 5273: Merge propagate-exceptions into http-leaks in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/leaking-tests/

------------------------------------------------------------
revno: 5273 [merge]
revision-id: v.ladeuil+lp at free.fr-20100605170611-oyml3ruiamddmv0w
parent: v.ladeuil+lp at free.fr-20100605162637-0a1zo7few7thwb6o
parent: v.ladeuil+lp at free.fr-20100605170604-1l0v8d4y9rh6ci4k
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-05 19:06:11 +0200
message:
  Merge propagate-exceptions into http-leaks
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2010-06-02 13:01:24 +0000
+++ b/bzrlib/osutils.py	2010-06-05 17:06:04 +0000
@@ -2038,7 +2038,7 @@
     # We don't use nor handle the timeout though
     def connect_socket(address, timeout=None):
         err = socket.error('getaddrinfo returns an empty list')
-        for res in socket.getaddrinfo(host, port):
+        for res in socket.getaddrinfo(*address):
             af, socktype, proto, canonname, sa = res
             sock = None
             try: