Rev 5278: 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: 5278 [merge]
revision-id: v.ladeuil+lp at free.fr-20100611071656-3dh1iuzt7t8a4j41
parent: v.ladeuil+lp at free.fr-20100611065536-2i7tdqiqtc0ec4ub
parent: v.ladeuil+lp at free.fr-20100611071651-sccfqgxrcnwu0udq
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Fri 2010-06-11 09:16:56 +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-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()