Changeset 7914

Timestamp:

07/13/08 03:48:18 (2 months ago)

Author:

russellm

Message:

Fixed #7718 -- Added a naive implementation of sorted() for Python 2.3 compatibility, and modified test cases to import the function when required.

Files:

• django/trunk/django/utils/itercompat.py (modified) (1 diff)
• django/trunk/tests/modeltests/basic/models.py (modified) (1 diff)
• django/trunk/tests/modeltests/or_lookups/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_scripts/management/commands/app_command.py (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_scripts/management/commands/base_command.py (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_scripts/management/commands/label_command.py (modified) (1 diff)
• django/trunk/tests/regressiontests/admin_scripts/management/commands/noargs_command.py (modified) (1 diff)
• django/trunk/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_inheritance_regress/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/utils/datastructures.py (modified) (1 diff)
• django/trunk/tests/regressiontests/utils/itercompat.py (added)
• django/trunk/tests/regressiontests/utils/tests.py (modified) (2 diffs)

django/trunk/django/utils/itercompat.py

@@ -68 +68 @@
-        return True
-
+def sorted(in_value):
+    "A naive implementation of sorted"
+    out_value = in_value[:]
+    out_value.sort()
+    return out_value

django/trunk/tests/modeltests/basic/models.py

@@ -5 +5 @@
-This is a basic model with only two non-primary-key fields.
-"""
-
+
-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

django/trunk/tests/modeltests/or_lookups/models.py

@@ -9 +9 @@
-add_to_query method).
-"""
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-from django.db import models

django/trunk/tests/regressiontests/admin_scripts/management/commands/app_command.py

@@ -1 +1 @@
-from django.core.management.base import AppCommand
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-class Command(AppCommand):

django/trunk/tests/regressiontests/admin_scripts/management/commands/base_command.py

@@ -1 +1 @@
-from django.core.management.base import BaseCommand
-from optparse import make_option
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-class Command(BaseCommand):

django/trunk/tests/regressiontests/admin_scripts/management/commands/label_command.py

@@ -1 +1 @@
-from django.core.management.base import LabelCommand
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-class Command(LabelCommand):

django/trunk/tests/regressiontests/admin_scripts/management/commands/noargs_command.py

@@ -1 +1 @@
-from django.core.management.base import NoArgsCommand
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-class Command(NoArgsCommand):

django/trunk/tests/regressiontests/defaultfilters/tests.py

@@ -538 +538 @@
-import datetime
-
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+
-if __name__ == '__main__':
-    import doctest

django/trunk/tests/regressiontests/model_inheritance_regress/models.py

@@ -6 +6 @@
-
-from django.db import models
+
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
-
-class Place(models.Model):

django/trunk/tests/regressiontests/queries/models.py

@@ -9 +9 @@
-from django.db.models.query import Q
-
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+                
-class Tag(models.Model):
-    name = models.CharField(max_length=10)

django/trunk/tests/regressiontests/utils/datastructures.py

@@ -50 +50 @@
-['second-two', 'one']
-"""
+
+# Python 2.3 doesn't have sorted()
+try:
+    sorted
+except NameError:
+    from django.utils.itercompat import sorted
+        

django/trunk/tests/regressiontests/utils/tests.py

@@ -9 +9 @@
-import timesince
-import datastructures
+import itercompat
-from decorators import DecoratorFromMiddlewareTests
-
@@ -15 +16 @@
-    'timesince': timesince,
-    'datastructures': datastructures,
+    'itercompat': itercompat,
-}
-