Context Navigation

Back to Ticket #12164

Ticket #12164: 12164.diff

File 12164.diff, 38.0 KB (added by Tim Graham, 15 years ago)

django/test/simple.py

             raise ValueError("Test label '%s' does not refer to a test class" % label)
         return TestClass(parts[2])
-# Python 2.3 compatibility: TestSuites were made iterable in 2.4.
-# We need to iterate over them, so we add the missing method when
-# necessary.
-try:
-    getattr(unittest.TestSuite, '__iter__')
-except AttributeError:
-    setattr(unittest.TestSuite, '__iter__', lambda s: iter(s._tests))
 def partition_suite(suite, classes, bins):
     """
     Partitions a test suite by test type.

django/db/models/options.py

 import re
 from bisect import bisect
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 from django.conf import settings
 from django.db.models.related import RelatedObject

django/db/models/fields/init.py

 import os
 import re
 import time
-try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal    # for Python 2.3
 from django.db import connection
 from django.db.models import signals

django/db/models/fields/related.py

 from django.core import exceptions
 from django import forms
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 RECURSIVE_RELATIONSHIP_CONSTANT = 'self'
 pending_lookups = {}

django/db/models/query_utils.py

 from django.utils import tree
 from django.utils.datastructures import SortedDict
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted  # For Python 2.3.
 class CyclicDependency(Exception):
     """
     An error when dealing with a collection of objects that have a cyclic

django/db/backends/sqlite3/base.py

 """
 SQLite3 backend for django.
 Python 2.3 and 2.4 require pysqlite2 (http://pysqlite.org/).
+Python 2.4 requires pysqlite2 (http://pysqlite.org/).
 Python 2.5 and later can use a pysqlite2 module or the sqlite3 module in the
 standard library.
 …
         module = 'either pysqlite2 or sqlite3 modules (tried in that order)'
     raise ImproperlyConfigured, "Error loading %s: %s" % (module, exc)
-try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal # for Python 2.3
 DatabaseError = Database.DatabaseError
 IntegrityError = Database.IntegrityError

django/db/backends/util.py

 from django.utils.hashcompat import md5_constructor
-try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal    # for Python 2.3
 class CursorDebugWrapper(object):
     def __init__(self, cursor, db):
         self.cursor = cursor

django/db/backends/init.py

 except ImportError:
     # Import copy of _thread_local.py from Python 2.4
     from django.utils._threading_local import local
-try:
-    set
-except NameError:
-    # Python 2.3 compat
-    from sets import Set as set
-try:
-    import decimal
-except ImportError:
-    # Python 2.3 fallback
-    from django.utils import _decimal as decimal
 from django.db.backends import util
 from django.utils import datetime_safe

django/db/backends/creation.py

 import sys
 import time
-try:
-    set
-except NameError:
-    # Python 2.3 compat
-    from sets import Set as set
 from django.conf import settings
 from django.core.management import call_command

django/db/transaction.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django.db import connection
 from django.conf import settings

django/forms/models.py

 from widgets import media_property
 from formsets import BaseFormSet, formset_factory, DELETION_FIELD_NAME
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 __all__ = (
     'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model',
     'save_instance', 'form_for_fields', 'ModelChoiceField',

django/forms/fields.py

 except ImportError:
     from StringIO import StringIO
-# Python 2.3 fallbacks
-try:
-    from decimal import Decimal, DecimalException
-except ImportError:
-    from django.utils._decimal import Decimal, DecimalException
-try:
-    set
-except NameError:
-    from sets import Set as set
 import django.core.exceptions
 from django.utils.translation import ugettext_lazy as _
 from django.utils.encoding import smart_unicode, smart_str

django/forms/widgets.py

 HTML Widget classes
 """
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 import copy
 from itertools import chain
 from django.conf import settings

django/core/serializers/json.py

 from django.utils import datetime_safe
 from django.utils import simplejson
-try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal    # Python 2.3 fallback
 class Serializer(PythonSerializer):
     """
     Convert a queryset to JSON.

django/core/serializers/pyyaml.py

 from StringIO import StringIO
 import yaml
-try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal # Python 2.3 fallback
 from django.db import models
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer

django/core/urlresolvers.py

 from django.utils.regex_helper import normalize
 from django.utils.thread_support import currentThread
-try:
-    reversed
-except NameError:
-    from django.utils.itercompat import reversed     # Python 2.3 fallback
-    from sets import Set as set
 _resolver_cache = {} # Maps URLconf modules to RegexURLResolver instances.
 _callable_cache = {} # Maps view and url pattern names to their view functions.

django/core/cache/backends/locmem.py

     def set(self, key, value, timeout=None):
         self._lock.writer_enters()
         # Python 2.3 and 2.4 don't allow combined try-except-finally blocks.
+        # Python 2.4 doesn't allow combined try-except-finally blocks.
         try:
             try:
                 self._set(key, pickle.dumps(value), timeout)

django/core/management/commands/makemessages.py

 from django.core.management.base import CommandError, BaseCommand
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
 # Intentionally silence DeprecationWarnings about os.popen3 in Python 2.6. It's
 # still sensible for us to use it, since subprocess didn't exist in 2.3.
 warnings.filterwarnings('ignore', category=DeprecationWarning, message=r'os\.popen3')

django/core/management/commands/loaddata.py

 from django.core.management.color import no_style
 try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
-try:
     import bz2
     has_bz2 = True
 except ImportError:

django/core/management/commands/compilemessages.py

 from optparse import make_option
 from django.core.management.base import BaseCommand, CommandError
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
 def compile_messages(locale=None):
     basedirs = [os.path.join('conf', 'locale'), 'locale']
     if os.environ.get('DJANGO_SETTINGS_MODULE'):

django/core/management/commands/syncdb.py

 from optparse import make_option
 import sys
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 class Command(NoArgsCommand):
     option_list = NoArgsCommand.option_list + (
         make_option('--noinput', action='store_false', dest='interactive', default=True,

django/core/management/base.py

 from django.core.exceptions import ImproperlyConfigured
 from django.core.management.color import color_style
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
 class CommandError(Exception):
     """
     Exception class indicating a problem while executing a management

django/core/management/sql.py

 import os
 import re
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 def sql_create(app, style):
     "Returns a list of the CREATE TABLE SQL statements for the given app."
     from django.db import connection, models

django/views/decorators/csrf.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 csrf_protect = decorator_from_middleware(CsrfViewMiddleware)
 csrf_protect.__name__ = "csrf_protect"

django/views/decorators/http.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from calendar import timegm
 from datetime import timedelta

django/views/decorators/vary.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django.utils.cache import patch_vary_headers

django/views/decorators/cache.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django.utils.decorators import decorator_from_middleware_with_args, auto_adapt_to_methods
 from django.utils.cache import patch_cache_control, add_never_cache_headers

django/dispatch/dispatcher.py

 import weakref
-try:
-    set
-except NameError:
-    from sets import Set as set # Python 2.3 fallback
 from django.dispatch import saferef

django/utils/translation/trans_real.py

     """
     This class sets up the GNUTranslations context with regard to output
     charset. Django uses a defined DEFAULT_CHARSET as the output charset on
     Python 2.4. With Python 2.3, use DjangoTranslation23.
+    Python 2.4.
     """
     def __init__(self, *args, **kw):
         from django.conf import settings
 …
     def __repr__(self):
         return "<DjangoTranslation lang:%s>" % self.__language
-class DjangoTranslation23(DjangoTranslation):
-    """
-    Compatibility class that is only used with Python 2.3.
-    Python 2.3 doesn't support set_output_charset on translation objects and
-    needs this wrapper class to make sure input charsets from translation files
-    are correctly translated to output charsets.
-    With a full switch to Python 2.4, this can be removed from the source.
-    """
-    def gettext(self, msgid):
-        res = self.ugettext(msgid)
-        return res.encode(self.django_output_charset)
-    def ngettext(self, msgid1, msgid2, n):
-        res = self.ungettext(msgid1, msgid2, n)
-        return res.encode(self.django_output_charset)
 def translation(language):
     """
     Returns a translation object.
 …
     # set up the right translation class
     klass = DjangoTranslation
-    if sys.version_info < (2, 4):
-        klass = DjangoTranslation23
     globalpath = os.path.join(os.path.dirname(sys.modules[settings.__module__].__file__), 'locale')

django/utils/functional.py

 # Summary of changes made to the Python 2.5 code below:
 #   * swapped ``partial`` for ``curry`` to maintain backwards-compatibility
 #     in Django.
-#   * Wrapped the ``setattr`` call in ``update_wrapper`` with a try-except
-#     block to make it compatible with Python 2.3, which doesn't allow
-#     assigning to ``__name__``.
 # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation.
 # All Rights Reserved.
 …
        function (defaults to functools.WRAPPER_UPDATES)
     """
     for attr in assigned:
+        try:
+            setattr(wrapper, attr, getattr(wrapped, attr))
+        except TypeError: # Python 2.3 doesn't allow assigning to __name__.
+            pass
+        setattr(wrapper, attr, getattr(wrapped, attr))
     for attr in updated:
         getattr(wrapper, attr).update(getattr(wrapped, attr))
     # Return the wrapper so this can be used as a decorator via curry()

django/utils/cache.py

 import re
 import time
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 from django.conf import settings
 from django.core.cache import cache

django/utils/decorators.py

 try:
     from functools import wraps, update_wrapper
 except ImportError:
     from django.utils.functional import wraps, update_wrapper  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps, update_wrapper  # Python 2.4 fallback.
 # Licence for MethodDecoratorAdaptor and auto_adapt_to_methods

django/utils/encoding.py

 from django.utils.functional import Promise
-try:
-    from decimal import Decimal
-except ImportError:
-    from django.utils._decimal import Decimal # Python 2.3 fallback
 class DjangoUnicodeDecodeError(UnicodeDecodeError):
     def __init__(self, obj, *args):
         self.obj = obj

django/contrib/formtools/utils.py

     data.append(settings.SECRET_KEY)
     # Use HIGHEST_PROTOCOL because it's the most efficient. It requires
     # Python 2.3, but Django requires 2.3 anyway, so that's OK.
+    # Python 2.3, but Django requires 2.4 anyway, so that's OK.
     pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
     return md5_constructor(pickled).hexdigest()

django/contrib/admin/validation.py

-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.forms.models import BaseModelForm, BaseModelFormSet, fields_for_model, _get_foreign_key

django/contrib/admin/options.py

 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext, ugettext_lazy
 from django.utils.encoding import force_unicode
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 HORIZONTAL, VERTICAL = 1, 2
 # returns the <ul> class for a given radio_admin field

django/contrib/admin/actions.py

 from django.utils.safestring import mark_safe
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy, ugettext as _
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 def delete_selected(modeladmin, request, queryset):
     """

django/contrib/admin/views/main.py

 from django.utils.http import urlencode
 import operator
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 # The system will display a "Show all" link on the change list only if the
 # total result count is less than or equal to this setting.
 MAX_SHOW_ALL_ALLOWED = 200

django/contrib/admin/views/decorators.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django import http, template
 from django.conf import settings

django/contrib/admin/sites.py

 from django.utils.translation import ugettext_lazy, ugettext as _
 from django.views.decorators.cache import never_cache
 from django.conf import settings
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
 LOGIN_FORM_KEY = 'this_is_the_login_form'

django/contrib/auth/decorators.py

 try:
     from functools import update_wrapper, wraps
 except ImportError:
     from django.utils.functional import update_wrapper, wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import update_wrapper, wraps  # Python 2.4 fallback.
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.http import HttpResponseRedirect

django/contrib/auth/backends.py

-try:
-    set
-except NameError:
-    from sets import Set as set # Python 2.3 fallback
 from django.db import connection
 from django.contrib.auth.models import User
 class ModelBackend(object):
     """
     Authenticates against django.contrib.auth.models.User.

django/contrib/auth/models.py

 UNUSABLE_PASSWORD = '!' # This will never be a valid hash
-try:
-    set
-except NameError:
-    from sets import Set as set   # Python 2.3 fallback
 def get_hexdigest(algorithm, salt, raw_password):
     """
     Returns a string of the hexdigest of the given plaintext password and salt

django/contrib/localflavor/br/forms.py

 from django.utils.translation import ugettext_lazy as _
 import re
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
 phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')
 class BRZipCodeField(RegexField):

django/template/defaultfilters.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django.template import Variable, Library
 from django.conf import settings

django/template/defaulttags.py

 import sys
 import re
 from itertools import cycle as itertools_cycle
-try:
-    reversed
-except NameError:
-    from django.utils.itercompat import reversed     # Python 2.3 fallback
 from django.template import Node, NodeList, Template, Context, Variable
 from django.template import TemplateSyntaxError, VariableDoesNotExist, BLOCK_TAG_START, BLOCK_TAG_END, VARIABLE_TAG_START, VARIABLE_TAG_END, SINGLE_BRACE_START, SINGLE_BRACE_END, COMMENT_TAG_START, COMMENT_TAG_END

tests/modeltests/basic/models.py

 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):

tests/modeltests/or_lookups/models.py

 clauses using the variable ``django.db.models.Q`` (or any object with an
 ``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

tests/modeltests/aggregation/models.py

 # coding: utf-8
 from django.db import models
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted      # For Python 2.3
 class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()

tests/modeltests/serializers/models.py

 ``QuerySet`` objects to and from "flat" data (i.e. strings).
 """
-try:
-    from decimal import Decimal
-except ImportError:
-    from django.utils._decimal import Decimal # Python 2.3 fallback
 from django.db import models
 class Category(models.Model):

tests/modeltests/model_forms/models.py

 from django.db import models
 from django.core.files.storage import FileSystemStorage
-# Python 2.3 doesn't have sorted()
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted
 temp_storage_dir = tempfile.mkdtemp()
 temp_storage = FileSystemStorage(temp_storage_dir)

tests/regressiontests/model_inheritance_regress/models.py

 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):
     name = models.CharField(max_length=50)
     address = models.CharField(max_length=80)

tests/regressiontests/defaultfilters/tests.py

 from django.template.defaultfilters import *
 import datetime
-# Python 2.3 doesn't have sorted()
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted
 if __name__ == '__main__':
     import doctest
     doctest.testmod()

tests/regressiontests/aggregation_regress/models.py

 from django.db import connection, models
 from django.conf import settings
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted      # For Python 2.3
 class Author(models.Model):
     name = models.CharField(max_length=100)
     age = models.IntegerField()

tests/regressiontests/decorators/tests.py

 try:
     from functools import wraps
 except ImportError:
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
+    from django.utils.functional import wraps  # Python 2.4 fallback.
 from django.http import HttpResponse, HttpRequest
 from django.utils.functional import allow_lazy, lazy, memoize

tests/regressiontests/i18n/misc.py

 'es-ar'
 """
 # Python 2.3 and 2.4 return slightly different results for completely bogus
+# Python 2.4 returns slightly different results for completely bogus
 # locales, so we omit this test for that anything below 2.4. It's relatively
 # harmless in any cases (GIGO). This also means this won't be executed on
 # Jython currently, but life's like that sometimes. (On those platforms,

tests/regressiontests/model_fields/models.py

 import tempfile
 try:
-    import decimal
-except ImportError:
-    from django.utils import _decimal as decimal    # Python 2.3 fallback
-try:
     # Checking for the existence of Image is enough for CPython, but for PyPy,
     # you need to check for the underlying modules.
     from PIL import Image, _imaging

tests/regressiontests/auth_backends/tests.py

-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
 __test__ = {'API_TESTS': """
 >>> from django.contrib.auth.models import User, Group, Permission, AnonymousUser
 >>> from django.contrib.contenttypes.models import ContentType

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

 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):
     option_list = BaseCommand.option_list + (

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

 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):
     help = "Test Label-based commands"

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

 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):
     help = 'Test Application-based commands'

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

 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):
     help = "Test No-args commands"

tests/regressiontests/utils/tests.py

 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,

tests/regressiontests/introspection/tests.py

 from models import Reporter, Article
-try:
-    set
-except NameError:
-    from sets import Set as set     # Python 2.3 fallback
+#
 # The introspection module is optional, so methods tested here might raise
 # NotImplementedError. This is perfectly acceptable behavior for the backend

tests/regressiontests/queries/models.py

 from django.db import models
 from django.db.models.query import Q, ITER_CHUNK_SIZE
-# Python 2.3 doesn't have sorted()
-try:
-    sorted
-except NameError:
-    from django.utils.itercompat import sorted
 class DumbCategory(models.Model):
     pass
 …
 """}
 # In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__
+# In Python 2.6 beta releases, exceptions raised in __len__
 # are swallowed (Python issue 1242657), so these cases return an empty list,
 # rather than raising an exception. Not a lot we can do about that,
 # unfortunately, due to the way Python handles list() calls internally. Thus,
 # we skip the tests for Python 2.3 and 2.6.
 if (2, 4) <= sys.version_info < (2, 6):
+# we skip the tests for Python 2.6.
+if sys.version_info < (2, 6):
     __test__["API_TESTS"] += """
 # If you're not careful, it's possible to introduce infinite loops via default
 # ordering on foreign keys in a cycle. We detect that.

tests/runtests.py

 import django.contrib as contrib
-try:
-    set
-except NameError:
-    from sets import Set as set     # For Python 2.3
 CONTRIB_DIR_NAME = 'django.contrib'
 MODEL_TESTS_DIR_NAME = 'modeltests'
 REGRESSION_TESTS_DIR_NAME = 'regressiontests'

Download in other formats:

Original Format

Issues

Context Navigation

Ticket #12164: 12164.diff

Download in other formats: