From e84f79f05113f546810c1908c7baef99fb1e874a Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Thu, 3 May 2012 15:27:01 +0200 Subject: Fixed #18042 -- Advanced deprecation warnings. Thanks Ramiro for the patch. --- django/contrib/formtools/tests/__init__.py | 9 +++++++++ django/contrib/formtools/wizard/legacy.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'django/contrib/formtools') diff --git a/django/contrib/formtools/tests/__init__.py b/django/contrib/formtools/tests/__init__.py index e628690491..96d1dda625 100644 --- a/django/contrib/formtools/tests/__init__.py +++ b/django/contrib/formtools/tests/__init__.py @@ -7,6 +7,7 @@ from django.conf import settings from django.contrib.formtools import preview, utils from django.contrib.formtools.wizard import FormWizard from django.test import TestCase +from django.test.utils import get_warnings_state, restore_warnings_state from django.test.utils import override_settings from django.utils import unittest @@ -40,12 +41,20 @@ class PreviewTests(TestCase): def setUp(self): super(PreviewTests, self).setUp() + self.save_warnings_state() + warnings.filterwarnings('ignore', category=DeprecationWarning, + module='django.contrib.formtools.wizard.legacy') + # Create a FormPreview instance to share between tests self.preview = preview.FormPreview(TestForm) input_template = '' self.input = input_template % (self.preview.unused_name('stage'), "%d") self.test_data = {'field1':u'foo', 'field1_':u'asdf'} + def tearDown(self): + super(PreviewTests, self).tearDown() + self.restore_warnings_state() + def test_unused_name(self): """ Verifies name mangling to get uniue field name. diff --git a/django/contrib/formtools/wizard/legacy.py b/django/contrib/formtools/wizard/legacy.py index 532635a3d9..d07e959de0 100644 --- a/django/contrib/formtools/wizard/legacy.py +++ b/django/contrib/formtools/wizard/legacy.py @@ -39,7 +39,7 @@ class FormWizard(object): warnings.warn( 'Old-style form wizards have been deprecated; use the class-based ' 'views in django.contrib.formtools.wizard.views instead.', - PendingDeprecationWarning) + DeprecationWarning) def __repr__(self): return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial) -- cgit v1.3