Rev 5272: Fix python-2.4 incompatibility. in file:///home/vila/src/bzr/experimental/leaking-tests/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sat Jun 5 17:26:38 BST 2010


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

------------------------------------------------------------
revno: 5272
revision-id: v.ladeuil+lp at free.fr-20100605162637-0a1zo7few7thwb6o
parent: v.ladeuil+lp at free.fr-20100605102545-woq8deyokfl3q61z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-05 18:26:37 +0200
message:
  Fix python-2.4 incompatibility.
  
  * bzrlib/tests/test_server.py:
  (ThreadWithException.run): Avoid try/except/finally, that's not
  supported by python-2.4.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-05 10:25:45 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-05 16:26:37 +0000
@@ -260,9 +260,10 @@
         """Overrides Thread.run to capture any exception."""
         self.ready.clear()
         try:
-            super(ThreadWithException, self).run()
-        except:
-            self.exception = sys.exc_info()
+            try:
+                super(ThreadWithException, self).run()
+            except:
+                self.exception = sys.exc_info()
         finally:
             # Make sure the calling thread is released
             self.ready.set()



More information about the bazaar-commits mailing list