gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk.

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

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index c3ad38d661..835c5c90cf 100644
--- a/tests/modeltests/basic/models.py
+++ b/tests/modeltests/basic/models.py
@@ -4,12 +4,18 @@
 
 This is a basic model with only two non-primary-key fields.
 """
-
+# Python 2.3 doesn't have set as a builtin
 try:
     set
 except NameError:
     from sets import Set as set
 
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+
 from django.db import models
 
 class Article(models.Model):