Rev 5268: Fix another python < 2.6 compatibility issue. in file:///home/vila/src/bzr/experimental/leaking-tests/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sat Jun 5 18:06:04 BST 2010


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

------------------------------------------------------------
revno: 5268
revision-id: v.ladeuil+lp at free.fr-20100605170604-1l0v8d4y9rh6ci4k
parent: v.ladeuil+lp at free.fr-20100603183206-jlk1gjq9egmru3k9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: propagate-exceptions
timestamp: Sat 2010-06-05 19:06:04 +0200
message:
  Fix another python < 2.6 compatibility issue.
  
  * bzrlib/osutils.py:
  (send_all.connect_socket): Bad copy/paste untested code :(
-------------- 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:



More information about the bazaar-commits mailing list