diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-09 00:11:09 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2011-02-09 00:11:09 +0000 |
| commit | c058dfa9cdd75cf23ab24985d4aeb257da8f267f (patch) | |
| tree | 2d1915858c8a384d116427fcbc8803c3db92928f | |
| parent | 5e485a15ad07b492e648fe784ddd136d36ffcac4 (diff) | |
| download | django-c058dfa9cdd75cf23ab24985d4aeb257da8f267f.tar.gz | |
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
| -rw-r--r-- | tests/regressiontests/admin_views/tests.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index 384959c500..8991048a07 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -386,7 +386,7 @@ class AdminJavaScriptTest(AdminViewBasicTest): 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 @@ class ValidXHTMLTests(TestCase): # 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() |