Rev 5266: 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: 5266 [merge]
revision-id: v.ladeuil+lp at free.fr-20100611071657-uhzhp4j1fp8h737r
parent: v.ladeuil+lp at free.fr-20100611065537-v0kajx4ofs0euh9t
parent: v.ladeuil+lp at free.fr-20100611071656-aw3twg1qq9q7e1gw
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: catch-them-all
timestamp: Fri 2010-06-11 09:16:57 +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-11 06:55:27 +0000
+++ b/bzrlib/osutils.py	2010-06-11 07:16:51 +0000
@@ -2046,7 +2046,7 @@
             sock.connect(sa)
             return sock
 
-        except exc_class, err:
+        except socket.error, err:
             # 'err' is now the most recent error
             if sock is not None:
                 sock.close()