Ticket #7745: 7745-part_b.diff

tests/regressiontests/utils/datastructures.py

@@ -1 @@
-"""
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+
+tests = """
 >>> from django.utils.datastructures import SortedDict
 
 >>> d = SortedDict()
@@ -6 +12 @@
 >>> d[1] = 'one'
 >>> d[9] = 'nine'
 >>> d.keys()
-[7, 1, 9]
+[7, 1, 9xxxxxxxx]
 >>> d.values()
 ['seven', 'one', 'nine']
 >>> d.items()
@@ -49 +55 @@
 >>> d.values() # Here the order of SortedDict values *is* what we are testing
 ['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

tests/regressiontests/utils/tests.py

@@ -7 +7 @@
 from django.utils import html, checksums
 
 import timesince
-import datastructures
+from datastructures import tests as datastructures
 import itercompat
 from decorators import DecoratorFromMiddlewareTests