From 3634948c883c89a9dbf303b9687331a2a5db43ce Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sat, 18 May 2013 16:40:03 +0200
Subject: [PATCH] Moved IgnorePendingDeprecationWarningsMixin in
 django.test.utils.

This mixin is useful whenever deprecating a large part of Django.
---
 django/test/utils.py                | 21 +++++++++++++++++++++
 tests/middleware/tests.py           |  4 +---
 tests/transactions/tests.py         | 14 +-------------
 tests/transactions_regress/tests.py |  4 +---
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/django/test/utils.py b/django/test/utils.py
index 92cef59f72..fb9221d25c 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -1,4 +1,5 @@
 import re
+import sys
 import warnings
 from functools import wraps
 from xml.dom.minidom import parseString, Node
@@ -380,3 +381,23 @@ class CaptureQueriesContext(object):
         if exc_type is not None:
             return
         self.final_queries = len(self.connection.queries)
+
+
+class IgnoreDeprecationWarningsMixin(object):
+
+    warning_class = DeprecationWarning
+
+    def setUp(self):
+        super(IgnoreDeprecationWarningsMixin, self).setUp()
+        self.catch_warnings = warnings.catch_warnings()
+        self.catch_warnings.__enter__()
+        warnings.filterwarnings("ignore", category=self.warning_class)
+
+    def tearDown(self):
+        self.catch_warnings.__exit__(*sys.exc_info())
+        super(IgnoreDeprecationWarningsMixin, self).tearDown()
+
+
+class IgnorePendingDeprecationWarningsMixin(IgnoreDeprecationWarningsMixin):
+
+        warning_class = PendingDeprecationWarning
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
 
 
diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
index aeb9bc3d2c..0f16a9c805 100644
--- a/tests/transactions/tests.py
+++ b/tests/transactions/tests.py
@@ -5,6 +5,7 @@ import warnings
 
 from django.db import connection, transaction, IntegrityError
 from django.test import TransactionTestCase, skipUnlessDBFeature
+from django.test.utils import IgnorePendingDeprecationWarningsMixin
 from django.utils import six
 from django.utils.unittest import skipIf, skipUnless
 
@@ -319,19 +320,6 @@ class AtomicMiscTests(TransactionTestCase):
         transaction.atomic(Callable())
 
 
-class IgnorePendingDeprecationWarningsMixin(object):
-
-    def setUp(self):
-        super(IgnorePendingDeprecationWarningsMixin, self).setUp()
-        self.catch_warnings = warnings.catch_warnings()
-        self.catch_warnings.__enter__()
-        warnings.filterwarnings("ignore", category=PendingDeprecationWarning)
-
-    def tearDown(self):
-        self.catch_warnings.__exit__(*sys.exc_info())
-        super(IgnorePendingDeprecationWarningsMixin, self).tearDown()
-
-
 class TransactionTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
 
     def create_a_reporter_then_fail(self, first, last):
diff --git a/tests/transactions_regress/tests.py b/tests/transactions_regress/tests.py
index fb3f257dab..5339b4a8ea 100644
--- a/tests/transactions_regress/tests.py
+++ b/tests/transactions_regress/tests.py
@@ -4,11 +4,9 @@ from django.db import (connection, connections, transaction, DEFAULT_DB_ALIAS, D
                        IntegrityError)
 from django.db.transaction import commit_on_success, commit_manually, TransactionManagementError
 from django.test import TransactionTestCase, skipUnlessDBFeature
-from django.test.utils import override_settings
+from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin
 from django.utils.unittest import skipIf, skipUnless
 
-from transactions.tests import IgnorePendingDeprecationWarningsMixin
-
 from .models import Mod, M2mA, M2mB, SubMod
 
 class ModelInheritanceTests(TransactionTestCase):