Ticket #7745: 23compat.diff

tests/regressiontests/admin_scripts/tests.py

@@ -108 +108 @@
         self.assertEquals(len(stream), 0, "Stream should be empty: actually contains '%s'" % stream)
     def assertOutput(self, stream, msg):
         "Utility assertion: assert that the given message exists in the output"
-        self.assertTrue(msg in stream, "'%s' does not match actual output text '%s'" % (msg, stream))
+        self.failUnless(msg in stream, "'%s' does not match actual output text '%s'" % (msg, stream))
 
 ##########################################################################
 # DJANGO ADMIN TESTS

tests/regressiontests/utils/datastructures.py

@@ +1 @@
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+
 """
 >>> from django.utils.datastructures import SortedDict
 
@@ -50 +56 @@
 ['second-two', 'one']
 """
 
-# Python 2.3 doesn't have sorted()
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted
-
- No newline at end of file