Rev 5286: 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: 5286 [merge]
revision-id: v.ladeuil+lp at free.fr-20100612151035-d7xlecfejoa35z9n
parent: v.ladeuil+lp at free.fr-20100612150012-icj4e01r8c1nrvbf
parent: v.ladeuil+lp at free.fr-20100612151026-xpl72f1j6s81jbzy
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: http-leaks
timestamp: Sat 2010-06-12 17:10:35 +0200
message:
  Merge propagate-exceptions into http-leaks
modified:
  bzrlib/tests/test_server.py    test_server.py-20100209163834-im1ozfuenfmqaa2m-1
-------------- next part --------------
=== modified file 'bzrlib/tests/test_server.py'
--- a/bzrlib/tests/test_server.py	2010-06-12 15:00:12 +0000
+++ b/bzrlib/tests/test_server.py	2010-06-12 15:10:35 +0000
@@ -263,7 +263,8 @@
         self.ignored_exceptions = None # see set_ignored_exceptions
 
     # compatibility thunk for python-2.4 and python-2.5...
-    name = property(threading.Thread.getName, threading.Thread.setName)
+    if sys.version_info < (2, 6):
+        name = property(threading.Thread.getName, threading.Thread.setName)
 
     def set_event(self, event):
         self.ready = event