Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Corrected merge failure from r15455.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c058dfa9cdd75cf23ab24985d4aeb257da8f267f 1 parent 5e485a1
Russell Keith-Magee freakboy3742 authored
Showing with 1 addition and 16 deletions.
  1. +1 −16 tests/regressiontests/admin_views/tests.py
17 tests/regressiontests/admin_views/tests.py
View
@@ -386,7 +386,7 @@ def testSingleWidgetFirsFieldFocus(self):
response,
'<script type="text/javascript">document.getElementById("id_name").focus();</script>'
)
-
+
def testMultiWidgetFirsFieldFocus(self):
"""
JavaScript-assisted auto-focus should work if a model/ModelAdmin setup
@@ -2398,21 +2398,6 @@ def setUp(self):
# Force re-evaluation of the contex processor list
django.template.context._standard_context_processors = None
self.client.login(username='super', password='secret')
- self.old_USE_THOUSAND_SEPARATOR = settings.USE_THOUSAND_SEPARATOR
- self.old_USE_L10N = settings.USE_L10N
- settings.USE_THOUSAND_SEPARATOR = True
- settings.USE_L10N = True
-
- def tearDown(self):
- settings.USE_THOUSAND_SEPARATOR = self.old_USE_THOUSAND_SEPARATOR
- settings.USE_L10N = self.old_USE_L10N
-
- def assert_non_localized_year(self, url, year):
- """Ensure that the year is not localized with
- USE_THOUSAND_SEPARATOR. Refs #15234.
- """
- response = self.client.get(url)
- self.assertNotContains(response, formats.number_format(year))
def tearDown(self):
self.client.logout()
Please sign in to comment.
Something went wrong with that request. Please try again.