Ticket #8061: 8061-python-2.3-fixes-r7903.patch

trac/admin/tests/console.py

@@ -132 +132 @@
             sys.stderr = _err
             sys.stdout = _out
             if expect_exception:
-                tb = traceback.format_exc()
+                tb = ''.join(traceback.format_exception(*sys.exc_info()))
                 message = tb.splitlines()[-1] + '\n'
                 return -1, message
             raise

trac/mimeview/tests/api.py

@@ -108 +108 @@
         self.assertEqual(Converter2(self.env), conversions[2][-1])
 
 class GroupLinesTestCase(unittest.TestCase):
+    
+    if not hasattr(unittest.TestCase, "assertTrue"):
+        assertTrue = unittest.TestCase.failUnless   # Python 2.3 compatibility
 
     def test_empty_stream(self):
         # FIXME: this currently fails

trac/mimeview/tests/patch.py

@@ -27 +27 @@
 
 
 class PatchRendererTestCase(unittest.TestCase):
+    
+    if not hasattr(unittest.TestCase, "assertTrue"):
+        assertTrue = unittest.TestCase.failUnless   # Python 2.3 compatibility
 
     def setUp(self):
         env = EnvironmentStub(enable=[Chrome, PatchRenderer])

trac/mimeview/tests/pygments.py

@@ -34 +34 @@
 
 class PygmentsRendererTestCase(unittest.TestCase):
 
+    if not hasattr(unittest.TestCase, "assertTrue"):
+        assertTrue = unittest.TestCase.failUnless   # Python 2.3 compatibility
+
     def setUp(self):
         self.env = EnvironmentStub(enable=[Chrome, PygmentsRenderer])
         self.pygments = Mimeview(self.env).renderers[0]

trac/test.py

@@ -123 +123 @@
             for test in self._tests:
                 if hasattr(test, 'setFixture'):
                     test.setFixture(self.fixture)
-        unittest.TestSuite.run(self, result)
+        for test in self._tests:    # Content of unittest.TestSuite.run()
+            if result.shouldStop:   # copied here for Python 2.3 compatibility
+                break
+            test(result)
         self.tearDown()
         return result
 
+    def __call__(self, *args, **kwds):      # Python 2.3 compatibility
+        return self.run(*args, **kwds)
+
 
 class TestCaseSetup(unittest.TestCase):
     def setFixture(self, fixture):