Updated list_route() and detail_route() deprecations.

carltongibson · carltongibson · commit 77c896ab4aa6 · 2018-10-02T11:59:10.000+02:00
diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py
@@ -219,9 +219,9 @@ def detail_route(methods=None, **kwargs):
     Used to mark a method on a ViewSet that should be routed for detail requests.
     """
     warnings.warn(
-        "`detail_route` is pending deprecation and will be removed in 3.10 in favor of "
+        "`detail_route` is deprecated and will be removed in 3.10 in favor of "
         "`action`, which accepts a `detail` bool. Use `@action(detail=True)` instead.",
-        PendingDeprecationWarning, stacklevel=2
+        DeprecationWarning, stacklevel=2
     )
 
     def decorator(func):
@@ -237,9 +237,9 @@ def list_route(methods=None, **kwargs):
     Used to mark a method on a ViewSet that should be routed for list requests.
     """
     warnings.warn(
-        "`list_route` is pending deprecation and will be removed in 3.10 in favor of "
+        "`list_route` is deprecated and will be removed in 3.10 in favor of "
         "`action`, which accepts a `detail` bool. Use `@action(detail=False)` instead.",
-        PendingDeprecationWarning, stacklevel=2
+        DeprecationWarning, stacklevel=2
     )
 
     def decorator(func):
diff --git a/rest_framework/schemas/generators.py b/rest_framework/schemas/generators.py
@@ -4,7 +4,6 @@
 See schemas.__init__.py for package overview.
 """
 import re
-import warnings
 from collections import Counter, OrderedDict
 from importlib import import_module
 
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
@@ -250,34 +250,34 @@ def test_action():
                 raise NotImplementedError
 
     def test_detail_route_deprecation(self):
-        with pytest.warns(PendingDeprecationWarning) as record:
+        with pytest.warns(DeprecationWarning) as record:
             @detail_route()
             def view(request):
                 raise NotImplementedError
 
         assert len(record) == 1
         assert str(record[0].message) == (
-            "`detail_route` is pending deprecation and will be removed in "
+            "`detail_route` is deprecated and will be removed in "
             "3.10 in favor of `action`, which accepts a `detail` bool. Use "
             "`@action(detail=True)` instead."
         )
 
     def test_list_route_deprecation(self):
-        with pytest.warns(PendingDeprecationWarning) as record:
+        with pytest.warns(DeprecationWarning) as record:
             @list_route()
             def view(request):
                 raise NotImplementedError
 
         assert len(record) == 1
         assert str(record[0].message) == (
-            "`list_route` is pending deprecation and will be removed in "
+            "`list_route` is deprecated and will be removed in "
             "3.10 in favor of `action`, which accepts a `detail` bool. Use "
             "`@action(detail=False)` instead."
         )
 
     def test_route_url_name_from_path(self):
         # pre-3.8 behavior was to base the `url_name` off of the `url_path`
-        with pytest.warns(PendingDeprecationWarning):
+        with pytest.warns(DeprecationWarning):
             @list_route(url_path='foo_bar')
             def view(request):
                 raise NotImplementedError
