Rev 5265: Merge sftp-leaks into catch-them-all in file:///home/vila/src/bzr/experimental/leaking-tests/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5265 [merge]
revision-id: v.ladeuil+lp at free.fr-20100611065537-v0kajx4ofs0euh9t
parent: v.ladeuil+lp at free.fr-20100610172308-w4eco88456iouogr
parent: v.ladeuil+lp at free.fr-20100611065537-i92yz32myy2jdppp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: catch-them-all
timestamp: Fri 2010-06-11 08:55:37 +0200
message:
  Merge sftp-leaks into catch-them-all
modified:
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2010-06-10 17:01:42 +0000
+++ b/bzrlib/osutils.py	2010-06-11 06:55:27 +0000
@@ -2030,28 +2030,27 @@
             sent_total += sent
             report_activity(sent, 'write')
 
-# socket.create_connection() is not available before python2.6, so we provide
-# it for earlier versions
-if getattr(socket, 'create_connection', None) is not None:
-    connect_socket = socket.create_connection
-else:
-    # We don't use nor handle the timeout though
-    def connect_socket(address, timeout=None):
-        err = socket.error('getaddrinfo returns an empty list')
-        host, port = address
-        for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
-            af, socktype, proto, canonname, sa = res
-            sock = None
-            try:
-                sock = socket.socket(af, socktype, proto)
-                sock.connect(sa)
-                return sock
-
-            except exc_class, err:
-                # 'err' is now the most recent error
-                if sock is not None:
-                    sock.close()
-        raise exc_class, err
+
+def connect_socket(address, timeout=None):
+    # Slight variation of the socket.create_connection() function (provided
+    # by python-2.6) that can fail if getaddrinfo returns an empty list. We
+    # also provide it for previous python versions. Also, we don't use the
+    # timeout parameter so we don't implement it either.
+    err = socket.error('getaddrinfo returns an empty list')
+    host, port = address
+    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+        af, socktype, proto, canonname, sa = res
+        sock = None
+        try:
+            sock = socket.socket(af, socktype, proto)
+            sock.connect(sa)
+            return sock
+
+        except exc_class, err:
+            # 'err' is now the most recent error
+            if sock is not None:
+                sock.close()
+    raise err
 
 
 def dereference_path(path):