Commit 0fdabe88 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Made a bunch of simplifications now that we don't support Python 2.4 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 579eb979

tests/regressiontests/decorators/tests.py

+1 −5
Original line number Diff line number Diff line 
from sys import version_info

try:

from functools import wraps

except ImportError:

    from django.utils.functional import wraps  # Python 2.4 fallback.



from django.contrib.auth.decorators import login_required, permission_required, user_passes_test

from django.contrib.admin.views.decorators import staff_member_required

tests/regressiontests/i18n/commands/extraction.py

+4 −5
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ class BasicExtractorTests(ExtractorTests): 
        os.chdir(self.test_dir)

        shutil.copyfile('./templates/template_with_error.txt', './templates/template_with_error.html')

        self.assertRaises(SyntaxError, management.call_command, 'makemessages', locale=LOCALE, verbosity=0)

        try: # TODO: Simplify this try/try block when we drop support for Python 2.4

        try:

            management.call_command('makemessages', locale=LOCALE, verbosity=0)

        except SyntaxError, e:

tests/regressiontests/i18n/tests.py

+13 −27
Original line number Diff line number Diff line
@@ -590,13 +590,6 @@ class MiscTests(TestCase): 
        r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-ar,de'}

        self.assertEqual('es-ar', g(r))



        # Python 2.3 and 2.4 return 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, passing in a truly bogus locale

        # will get you the default locale back.)

        if sys.version_info >= (2, 5):

        # This test assumes there won't be a Django translation to a US

        # variation of the Spanish language, a safe assumption. When the

        # user sets it as the preferred language, the main 'es'
@@ -631,13 +624,6 @@ class MiscTests(TestCase): 
        r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'}

        self.assertEqual('es', g(r))



        # Python 2.3 and 2.4 return 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, passing in a truly bogus locale

        # will get you the default locale back.)

        if sys.version_info >= (2, 5):

        # This test assumes there won't be a Django translation to a US

        # variation of the Spanish language, a safe assumption. When the

        # user sets it as the preferred language, the main 'es'