Fixed #21188 -- Introduced subclasses for to-be-removed-in-django-XX warnings

Thanks Anssi Kääriäinen for the idea and Simon Charette for the
review.

1 files changed, 3 insertions, 2 deletions

diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py
index be0c559c1b..2b315be7c8 100644
--- a/django/db/models/sql/where.py
+++ b/django/db/models/sql/where.py
@@ -11,6 +11,7 @@ from django.conf import settings
 from django.db.models.fields import DateTimeField, Field
 from django.db.models.sql.datastructures import EmptyResultSet, Empty
 from django.db.models.sql.aggregates import Aggregate
+from django.utils.deprecation import RemovedInDjango19Warning
 from django.utils.six.moves import xrange
 from django.utils import timezone
 from django.utils import tree
@@ -177,7 +178,7 @@ class WhereNode(tree.Node):
         """
         warnings.warn(
             "The make_atom() method will be removed in Django 1.9. Use Lookup class instead.",
-            PendingDeprecationWarning)
+            RemovedInDjango19Warning)
         lvalue, lookup_type, value_annotation, params_or_value = child
         field_internal_type = lvalue.field.get_internal_type() if lvalue.field else None
 
@@ -355,7 +356,7 @@ class Constraint(object):
     def __init__(self, alias, col, field):
         warnings.warn(
             "The Constraint class will be removed in Django 1.9. Use Lookup class instead.",
-            PendingDeprecationWarning)
+            RemovedInDjango19Warning)
         self.alias, self.col, self.field = alias, col, field
 
     def prepare(self, lookup_type, value):