Skip to content

Commit

Permalink
Changed strategy used to force evaluation of django.utils.translation…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
ramiro committed Feb 16, 2011
1 parent 9ebc910 commit 8c3416f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tests/regressiontests/i18n/test_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
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


Expand All @@ -26,7 +27,7 @@ def test_warn_if_project_has_locale_subdir(self):
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):
Expand All @@ -36,7 +37,7 @@ def test_no_warn_if_project_and_locale_paths_overlap(self):
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:
Expand Down

0 comments on commit 8c3416f

Please sign in to comment.