gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis

git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 7 insertions, 6 deletions

diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py
index 5d31d21318..8ac6b9ec7e 100644
--- a/tests/regressiontests/utils/datastructures.py
+++ b/tests/regressiontests/utils/datastructures.py
@@ -50,9 +50,3 @@
 ['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
diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py
index cd4762e02f..485c5faa75 100644
--- a/tests/regressiontests/utils/tests.py
+++ b/tests/regressiontests/utils/tests.py
@@ -11,6 +11,13 @@ import datastructures
 import itercompat
 from decorators import DecoratorFromMiddlewareTests
 
+# We need this because "datastructures" uses sorted() and the tests are run in
+# the scope of this module.
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted  # For Python 2.3
+
 # Extra tests
 __test__ = {
     'timesince': timesince,