diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-11 12:20:07 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-11 12:20:07 +0000 |
| commit | 1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 (patch) | |
| tree | 93b5721fe4e0664b993dd0d0b1dee544df304b22 /tests/regressiontests/templates | |
| parent | 5e5be2c44caaae3192a9f8ae1ce0adc0da3d8c4d (diff) | |
Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/templates')
| -rw-r--r-- | tests/regressiontests/templates/loaders.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/regressiontests/templates/loaders.py b/tests/regressiontests/templates/loaders.py index caa3faa6bc..40beb2997a 100644 --- a/tests/regressiontests/templates/loaders.py +++ b/tests/regressiontests/templates/loaders.py @@ -67,7 +67,8 @@ class DeprecatedEggLoaderTest(unittest.TestCase): }) self._old_installed_apps = settings.INSTALLED_APPS settings.INSTALLED_APPS = [] - warnings.simplefilter("ignore", PendingDeprecationWarning) + warnings.filterwarnings("ignore", category=DeprecationWarning, + module='django.template.loaders.eggs') def tearDown(self): settings.INSTALLED_APPS = self._old_installed_apps @@ -79,6 +80,8 @@ class DeprecatedEggLoaderTest(unittest.TestCase): contents, template_name = lts_egg("y.html") self.assertEqual(contents, "y") self.assertEqual(template_name, "egg:egg_1:templates/y.html") + warnings.resetwarnings() + warnings.simplefilter("ignore", PendingDeprecationWarning) class EggLoaderTest(unittest.TestCase): |