Commit c058dfa9 authored by Russell Keith-Magee's avatar Russell Keith-Magee
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
parent 5e485a15

tests/regressiontests/admin_views/tests.py

+1 −16
Original line number Diff line number Diff line
@@ -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()