diff options
| -rw-r--r-- | django/contrib/formtools/tests/__init__.py | 9 | ||||
| -rw-r--r-- | tests/regressiontests/test_runner/tests.py | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/django/contrib/formtools/tests/__init__.py b/django/contrib/formtools/tests/__init__.py index 604797f01c..d659403704 100644 --- a/django/contrib/formtools/tests/__init__.py +++ b/django/contrib/formtools/tests/__init__.py @@ -7,7 +7,6 @@ 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.utils import unittest from django.contrib.formtools.tests.wizard import * @@ -47,20 +46,12 @@ class PreviewTests(FormToolsTestCase): def setUp(self): super(PreviewTests, self).setUp() - self.save_warnings_state() - warnings.filterwarnings('ignore', category=DeprecationWarning, - module='django.contrib.formtools.utils') - # Create a FormPreview instance to share between tests self.preview = preview.FormPreview(TestForm) input_template = '<input type="hidden" name="%s" value="%s" />' 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/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py index 22baf0afdc..ccb65b49fe 100644 --- a/tests/regressiontests/test_runner/tests.py +++ b/tests/regressiontests/test_runner/tests.py @@ -3,9 +3,7 @@ Tests for django test runner """ from __future__ import absolute_import -import StringIO from optparse import make_option -import warnings from django.core.exceptions import ImproperlyConfigured from django.core.management import call_command @@ -13,7 +11,6 @@ from django import db from django.test import simple from django.test.simple import DjangoTestSuiteRunner, get_tests from django.test.testcases import connections_support_transactions -from django.test.utils import get_warnings_state, restore_warnings_state from django.utils import unittest from django.utils.importlib import import_module |