diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-05-18 17:39:14 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-05-18 17:39:14 +0200 |
| commit | dc8814bf7dc5139f3d11b8f9f44f54c7f77d2714 (patch) | |
| tree | c945461d8380a1b6034f8e91a6939ec88840548a /tests/middleware | |
| parent | acd0bb39df5c9ca486e49ec55ae34538242ce071 (diff) | |
| parent | bd97f7d0cb72191744552142817184e88ce8841d (diff) | |
Merge branch 'master' of github.com:django/django
Diffstat (limited to 'tests/middleware')
| -rw-r--r-- | tests/middleware/tests.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py index e526da4772..1ff8390f31 100644 --- a/tests/middleware/tests.py +++ b/tests/middleware/tests.py @@ -18,14 +18,12 @@ from django.middleware.http import ConditionalGetMiddleware from django.middleware.gzip import GZipMiddleware from django.middleware.transaction import TransactionMiddleware from django.test import TransactionTestCase, TestCase, RequestFactory -from django.test.utils import override_settings +from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin from django.utils import six from django.utils.encoding import force_str from django.utils.six.moves import xrange from django.utils.unittest import expectedFailure, skipIf -from transactions.tests import IgnorePendingDeprecationWarningsMixin - from .models import Band |
