Advanced deprecation warnings for Django 1.7.

15 files changed, 36 insertions, 37 deletions

diff --git a/tests/admin_scripts/app_with_import/models.py b/tests/admin_scripts/app_with_import/models.py
index 17a892bd17..89125c386f 100644
--- a/tests/admin_scripts/app_with_import/models.py
+++ b/tests/admin_scripts/app_with_import/models.py
@@ -1,8 +1,8 @@
 from django.db import models
-from django.contrib.comments.models import Comment
+from django.contrib.auth.models import User
 
 
 # Regression for #13368. This is an example of a model
 # that imports a class that has an abstract base class.
-class CommentScore(models.Model):
-    comment = models.OneToOneField(Comment, primary_key=True)
+class UserProfile(models.Model):
+    user = models.OneToOneField(User, primary_key=True)
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py
index 2f399acb23..2b772598d3 100644
--- a/tests/admin_scripts/tests.py
+++ b/tests/admin_scripts/tests.py
@@ -1079,7 +1079,6 @@ class ManageValidate(AdminScriptTestCase):
         "manage.py validate does not raise errors when an app imports a base class that itself has an abstract base"
         self.write_settings('settings.py',
             apps=['admin_scripts.app_with_import',
-                  'django.contrib.comments',
                   'django.contrib.auth',
                   'django.contrib.contenttypes',
                   'django.contrib.sites'],
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index 7413a4aae6..060f27e6e2 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -28,7 +28,7 @@ from django.middleware.cache import (FetchFromCacheMiddleware,
 from django.template import Template
 from django.template.response import TemplateResponse
 from django.test import TestCase, TransactionTestCase, RequestFactory
-from django.test.utils import override_settings, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
 from django.utils import six, timezone, translation, unittest
 from django.utils.cache import (patch_vary_headers, get_cache_key,
     learn_cache_key, patch_cache_control, patch_response_headers)
@@ -1594,7 +1594,7 @@ def hello_world_view(request, value):
             },
         },
 )
-class CacheMiddlewareTest(IgnorePendingDeprecationWarningsMixin, TestCase):
+class CacheMiddlewareTest(IgnoreDeprecationWarningsMixin, TestCase):
 
     def setUp(self):
         super(CacheMiddlewareTest, self).setUp()
diff --git a/tests/deprecation/tests.py b/tests/deprecation/tests.py
index df752b3149..fda780c7e6 100644
--- a/tests/deprecation/tests.py
+++ b/tests/deprecation/tests.py
@@ -8,7 +8,7 @@ from django.utils.deprecation import RenameMethodsBase
 
 class RenameManagerMethods(RenameMethodsBase):
     renamed_methods = (
-        ('old', 'new', PendingDeprecationWarning),
+        ('old', 'new', DeprecationWarning),
     )
 
 
diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py
index 84d18ebcb2..982d9e5778 100644
--- a/tests/generic_views/test_edit.py
+++ b/tests/generic_views/test_edit.py
@@ -146,7 +146,7 @@ class CreateViewTests(TestCase):
     def test_create_view_all_fields(self):
 
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
 
             class MyCreateView(CreateView):
                 model = Author
@@ -160,7 +160,7 @@ class CreateViewTests(TestCase):
     def test_create_view_without_explicit_fields(self):
 
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
 
             class MyCreateView(CreateView):
                 model = Author
@@ -171,7 +171,7 @@ class CreateViewTests(TestCase):
                              ['name', 'slug'])
 
         # but with a warning:
-        self.assertEqual(w[0].category, PendingDeprecationWarning)
+        self.assertEqual(w[0].category, DeprecationWarning)
 
 
 class UpdateViewTests(TestCase):
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index 20645cf91f..f3165f939f 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -18,7 +18,7 @@ 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, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
 from django.utils import six
 from django.utils.encoding import force_str
 from django.utils.six.moves import xrange
@@ -249,7 +249,7 @@ class CommonMiddlewareTest(TestCase):
         request = self._get_request('regular_url/that/does/not/exist')
         request.META['HTTP_REFERER'] = '/another/url/'
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            warnings.simplefilter("ignore", DeprecationWarning)
             response = self.client.get(request.path)
             CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 1)
@@ -261,7 +261,7 @@ class CommonMiddlewareTest(TestCase):
     def test_404_error_reporting_no_referer(self):
         request = self._get_request('regular_url/that/does/not/exist')
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            warnings.simplefilter("ignore", DeprecationWarning)
             response = self.client.get(request.path)
             CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 0)
@@ -273,7 +273,7 @@ class CommonMiddlewareTest(TestCase):
         request = self._get_request('foo_url/that/does/not/exist/either')
         request.META['HTTP_REFERER'] = '/another/url/'
         with warnings.catch_warnings():
-            warnings.simplefilter("ignore", PendingDeprecationWarning)
+            warnings.simplefilter("ignore", DeprecationWarning)
             response = self.client.get(request.path)
             CommonMiddleware().process_response(request, response)
         self.assertEqual(len(mail.outbox), 0)
@@ -703,7 +703,7 @@ class ETagGZipMiddlewareTest(TestCase):
 
         self.assertNotEqual(gzip_etag, nogzip_etag)
 
-class TransactionMiddlewareTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionMiddlewareTest(IgnoreDeprecationWarningsMixin, TransactionTestCase):
     """
     Test the transaction middleware.
     """
diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py
index 39be824798..2c3caef016 100644
--- a/tests/model_forms/tests.py
+++ b/tests/model_forms/tests.py
@@ -266,7 +266,7 @@ class ModelFormBaseTest(TestCase):
 
     def test_missing_fields_attribute(self):
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
 
             class MissingFieldsForm(forms.ModelForm):
                 class Meta:
@@ -276,7 +276,7 @@ class ModelFormBaseTest(TestCase):
         # if a warning has been seen already, the catch_warnings won't
         # have recorded it. The following line therefore will not work reliably:
 
-        # self.assertEqual(w[0].category, PendingDeprecationWarning)
+        # self.assertEqual(w[0].category, DeprecationWarning)
 
         # Until end of the deprecation cycle, should still create the
         # form as before:
diff --git a/tests/model_forms_regress/tests.py b/tests/model_forms_regress/tests.py
index 39ae857219..29d66a2cf0 100644
--- a/tests/model_forms_regress/tests.py
+++ b/tests/model_forms_regress/tests.py
@@ -566,10 +566,10 @@ class CustomMetaclassTestCase(TestCase):
 class TestTicket19733(TestCase):
     def test_modelform_factory_without_fields(self):
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always", PendingDeprecationWarning)
+            warnings.simplefilter("always", DeprecationWarning)
             # This should become an error once deprecation cycle is complete.
             form = modelform_factory(Person)
-        self.assertEqual(w[0].category, PendingDeprecationWarning)
+        self.assertEqual(w[0].category, DeprecationWarning)
 
     def test_modelform_factory_with_all_fields(self):
         form = modelform_factory(Person, fields="__all__")
diff --git a/tests/runtests.py b/tests/runtests.py
index da4592ecc0..b604155190 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -109,7 +109,7 @@ def setup(verbosity, test_labels):
 
     # Load all the ALWAYS_INSTALLED_APPS.
     with warnings.catch_warnings():
-        warnings.filterwarnings('ignore', 'django.contrib.comments is deprecated and will be removed before Django 1.8.', PendingDeprecationWarning)
+        warnings.filterwarnings('ignore', 'django.contrib.comments is deprecated and will be removed before Django 1.8.', DeprecationWarning)
         get_apps()
 
     # Load all the test model apps.
diff --git a/tests/template_tests/tests.py b/tests/template_tests/tests.py
index 76712a09a6..ff31795fff 100644
--- a/tests/template_tests/tests.py
+++ b/tests/template_tests/tests.py
@@ -534,7 +534,7 @@ class TemplateTests(TransRealMixin, TestCase):
                         try:
                             with warnings.catch_warnings():
                                 # Ignore pending deprecations of the old syntax of the 'cycle' and 'firstof' tags.
-                                warnings.filterwarnings("ignore", category=PendingDeprecationWarning, module='django.template.base')
+                                warnings.filterwarnings("ignore", category=DeprecationWarning, module='django.template.base')
                                 test_template = loader.get_template(name)
                         except ShouldNotExecuteException:
                             failures.append("Template test (Cached='%s', TEMPLATE_STRING_IF_INVALID='%s', TEMPLATE_DEBUG=%s): %s -- FAILED. Template loading invoked method that shouldn't have been invoked." % (is_cached, invalid_str, template_debug, name))
diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py
index 0dc7a0155a..53a268e823 100644
--- a/tests/test_runner/tests.py
+++ b/tests/test_runner/tests.py
@@ -11,7 +11,7 @@ from django.core.management import call_command
 from django import db
 from django.test import runner, TestCase, TransactionTestCase, skipUnlessDBFeature
 from django.test.testcases import connections_support_transactions
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
 from django.utils import unittest
 from django.utils.importlib import import_module
 
@@ -225,7 +225,7 @@ class Ticket17477RegressionTests(AdminScriptTestCase):
         self.assertNoOutput(err)
 
 
-class ModulesTestsPackages(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
+class ModulesTestsPackages(IgnoreDeprecationWarningsMixin, unittest.TestCase):
     def test_get_tests(self):
         "Check that the get_tests helper function can find tests in a directory"
         from django.test.simple import get_tests
diff --git a/tests/test_suite_override/tests.py b/tests/test_suite_override/tests.py
index 35ca2b060b..6050e0c509 100644
--- a/tests/test_suite_override/tests.py
+++ b/tests/test_suite_override/tests.py
@@ -1,5 +1,5 @@
 from django.db.models import get_app
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
 from django.utils import unittest
 
 
@@ -9,7 +9,7 @@ def suite():
     return testSuite
 
 
-class SuiteOverrideTest(IgnorePendingDeprecationWarningsMixin, unittest.TestCase):
+class SuiteOverrideTest(IgnoreDeprecationWarningsMixin, unittest.TestCase):
     def test_suite_override(self):
         """
         Validate that you can define a custom suite when running tests with
diff --git a/tests/test_utils/tests.py b/tests/test_utils/tests.py
index 8c6c15e357..ec98a845a0 100644
--- a/tests/test_utils/tests.py
+++ b/tests/test_utils/tests.py
@@ -7,7 +7,7 @@ from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
 from django.test.html import HTMLParseError, parse_html
-from django.test.utils import CaptureQueriesContext, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import CaptureQueriesContext, IgnoreDeprecationWarningsMixin
 from django.utils import six
 from django.utils import unittest
 from django.utils.unittest import skip
@@ -591,7 +591,7 @@ class AssertFieldOutputTests(SimpleTestCase):
         self.assertFieldOutput(MyCustomField, {}, {}, empty_value=None)
 
 
-class DoctestNormalizerTest(IgnorePendingDeprecationWarningsMixin, SimpleTestCase):
+class DoctestNormalizerTest(IgnoreDeprecationWarningsMixin, SimpleTestCase):
 
     def test_normalizer(self):
         from django.test.simple import make_doctest
diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
index 756fa40abd..2da4d9fc9a 100644
--- a/tests/transactions/tests.py
+++ b/tests/transactions/tests.py
@@ -4,7 +4,7 @@ import sys
 
 from django.db import connection, transaction, DatabaseError, IntegrityError
 from django.test import TransactionTestCase, skipUnlessDBFeature
-from django.test.utils import IgnorePendingDeprecationWarningsMixin
+from django.test.utils import IgnoreDeprecationWarningsMixin
 from django.utils import six
 from django.utils.unittest import skipIf, skipUnless
 
@@ -350,7 +350,7 @@ class AtomicMiscTests(TransactionTestCase):
         transaction.atomic(Callable())
 
 
-class TransactionTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
 
     available_apps = ['transactions']
 
@@ -508,7 +508,7 @@ class TransactionTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCas
         )
 
 
-class TransactionRollbackTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionRollbackTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
 
     available_apps = ['transactions']
 
@@ -528,7 +528,7 @@ class TransactionRollbackTests(IgnorePendingDeprecationWarningsMixin, Transactio
         self.assertRaises(IntegrityError, execute_bad_sql)
         transaction.rollback()
 
-class TransactionContextManagerTests(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TransactionContextManagerTests(IgnoreDeprecationWarningsMixin, TransactionTestCase):
 
     available_apps = ['transactions']
 
diff --git a/tests/transactions_regress/tests.py b/tests/transactions_regress/tests.py
index 8078f1d128..7db32fa4f3 100644
--- a/tests/transactions_regress/tests.py
+++ b/tests/transactions_regress/tests.py
@@ -4,7 +4,7 @@ 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, IgnorePendingDeprecationWarningsMixin
+from django.test.utils import override_settings, IgnoreDeprecationWarningsMixin
 from django.utils.unittest import skipIf, skipUnless
 
 from .models import Mod, M2mA, M2mB, SubMod
@@ -30,7 +30,7 @@ class ModelInheritanceTests(TransactionTestCase):
         self.assertEqual(SubMod.objects.count(), 1)
         self.assertEqual(Mod.objects.count(), 1)
 
-class TestTransactionClosing(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestTransactionClosing(IgnoreDeprecationWarningsMixin, TransactionTestCase):
     """
     Tests to make sure that transactions are properly closed
     when they should be, and aren't left pending after operations
@@ -194,7 +194,7 @@ class TestTransactionClosing(IgnorePendingDeprecationWarningsMixin, TransactionT
         (connection.settings_dict['NAME'] == ':memory:' or
          not connection.settings_dict['NAME']),
         'Test uses multiple connections, but in-memory sqlite does not support this')
-class TestNewConnection(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestNewConnection(IgnoreDeprecationWarningsMixin, TransactionTestCase):
     """
     Check that new connections don't have special behaviour.
     """
@@ -242,7 +242,7 @@ class TestNewConnection(IgnorePendingDeprecationWarningsMixin, TransactionTestCa
 
 @skipUnless(connection.vendor == 'postgresql',
             "This test only valid for PostgreSQL")
-class TestPostgresAutocommitAndIsolation(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestPostgresAutocommitAndIsolation(IgnoreDeprecationWarningsMixin, TransactionTestCase):
     """
     Tests to make sure psycopg2's autocommit mode and isolation level
     is restored after entering and leaving transaction management.
@@ -326,7 +326,7 @@ class TestPostgresAutocommitAndIsolation(IgnorePendingDeprecationWarningsMixin,
         self.assertTrue(connection.autocommit)
 
 
-class TestManyToManyAddTransaction(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class TestManyToManyAddTransaction(IgnoreDeprecationWarningsMixin, TransactionTestCase):
 
     available_apps = ['transactions_regress']
 
@@ -344,7 +344,7 @@ class TestManyToManyAddTransaction(IgnorePendingDeprecationWarningsMixin, Transa
         self.assertEqual(a.others.count(), 1)
 
 
-class SavepointTest(IgnorePendingDeprecationWarningsMixin, TransactionTestCase):
+class SavepointTest(IgnoreDeprecationWarningsMixin, TransactionTestCase):
 
     available_apps = ['transactions_regress']