Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
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
  • Loading branch information...
commit 0fdabe885baabae291da23570966a9e4a4e4df6d 1 parent 579eb97
@adrianholovaty adrianholovaty authored
View
6 tests/regressiontests/decorators/tests.py
@@ -1,8 +1,4 @@
-from sys import version_info
-try:
- from functools import wraps
-except ImportError:
- from django.utils.functional import wraps # Python 2.4 fallback.
+from functools import wraps
from django.contrib.auth.decorators import login_required, permission_required, user_passes_test
from django.contrib.admin.views.decorators import staff_member_required
View
9 tests/regressiontests/i18n/commands/extraction.py
@@ -75,11 +75,10 @@ def test_extraction_error(self):
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:
- self.assertEqual(str(e), 'Translation blocks must not include other block tags: blocktrans (file templates/template_with_error.html, line 3)')
+ try:
+ management.call_command('makemessages', locale=LOCALE, verbosity=0)
+ except SyntaxError, e:
+ self.assertEqual(str(e), 'Translation blocks must not include other block tags: blocktrans (file templates/template_with_error.html, line 3)')
finally:
os.remove('./templates/template_with_error.html')
os.remove('./templates/template_with_error.html.py') # Waiting for #8536 to be fixed
View
40 tests/regressiontests/i18n/tests.py
@@ -590,19 +590,12 @@ def test_parse_literal_http_header(self):
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'
- # translation should be selected instead.
- r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-us'}
- self.assertEqual(g(r), 'es')
+ # 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'
+ # translation should be selected instead.
+ r.META = {'HTTP_ACCEPT_LANGUAGE': 'es-us'}
+ self.assertEqual(g(r), 'es')
# This tests the following scenario: there isn't a main language (zh)
# translation of Django but there is a translation to variation (zh_CN)
@@ -631,20 +624,13 @@ def test_parse_language_cookie(self):
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'
- # translation should be selected instead.
- r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'es-us'}
- r.META = {}
- self.assertEqual(g(r), 'es')
+ # 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'
+ # translation should be selected instead.
+ r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'es-us'}
+ r.META = {}
+ self.assertEqual(g(r), 'es')
# This tests the following scenario: there isn't a main language (zh)
# translation of Django but there is a translation to variation (zh_CN)
Please sign in to comment.
Something went wrong with that request. Please try again.