newforms-admin: Merged from trunk up to [7917].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7922 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/utils/datastructures.py

@@ -44,8 +44,15 @@
 >>> d.keys()
 [2, 1]
 >>> real_dict = dict(tuples)
->>> real_dict.values()
+>>> sorted(real_dict.values())
 ['one', 'second-two']
->>> d.values()
+>>> 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
+