From 8c3416f4688d5f6fe84aac1264a6c54ee326960d Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Wed, 16 Feb 2011 22:30:44 +0000 Subject: [PATCH] Changed strategy used to force evaluation of django.utils.translation in tests added in r15508 and r15513 to not use reload(). Thanks Alex for reporting it caused problems. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15554 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/i18n/test_warnings.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/regressiontests/i18n/test_warnings.py b/tests/regressiontests/i18n/test_warnings.py index d9899c10b1..72255e2faf 100644 --- a/tests/regressiontests/i18n/test_warnings.py +++ b/tests/regressiontests/i18n/test_warnings.py @@ -4,6 +4,7 @@ import warnings import django from django.conf import settings from django.test.utils import get_warnings_state, restore_warnings_state +from django.utils.translation import _trans from django.utils.unittest import TestCase @@ -26,7 +27,7 @@ class DeprecationWarningTests(TestCase): warnings.filterwarnings('error', "Translations in the project directory aren't supported anymore\. Use the LOCALE_PATHS setting instead\.", PendingDeprecationWarning) - reload(django.utils.translation) + _trans.__dict__ = {} self.assertRaises(PendingDeprecationWarning, django.utils.translation.ugettext, 'Time') def test_no_warn_if_project_and_locale_paths_overlap(self): @@ -36,7 +37,7 @@ class DeprecationWarningTests(TestCase): warnings.filterwarnings('error', "Translations in the project directory aren't supported anymore\. Use the LOCALE_PATHS setting instead\.", PendingDeprecationWarning) - reload(django.utils.translation) + _trans.__dict__ = {} try: django.utils.translation.ugettext('Time') except PendingDeprecationWarning: