From 06d89441a65e64485b5686ec0eec9654c30a97fe Mon Sep 17 00:00:00 2001 From: Carlton Gibson Date: Tue, 2 Oct 2018 12:19:00 +0200 Subject: [PATCH] Weakened to PendingDeprecationWarning for `base_name` cc @rpkilby. --- rest_framework/routers.py | 6 +++--- tests/test_routers.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index db1492c45..de04cb674 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -77,7 +77,7 @@ def flatten(list_of_lists): class RenameRouterMethods(RenameMethodsBase): renamed_methods = ( - ('get_default_base_name', 'get_default_basename', DeprecationWarning), + ('get_default_base_name', 'get_default_basename', PendingDeprecationWarning), ) @@ -87,8 +87,8 @@ class BaseRouter(six.with_metaclass(RenameRouterMethods)): def register(self, prefix, viewset, basename=None, base_name=None): if base_name is not None: - msg = "The `base_name` argument has been deprecated in favor of `basename`." - warnings.warn(msg, DeprecationWarning, 2) + msg = "The `base_name` argument is pending deprecation in favor of `basename`." + warnings.warn(msg, PendingDeprecationWarning, 2) assert not (basename and base_name), ( "Do not provide both the `basename` and `base_name` arguments.") diff --git a/tests/test_routers.py b/tests/test_routers.py index 1dd2d2b0a..eae3f5458 100644 --- a/tests/test_routers.py +++ b/tests/test_routers.py @@ -495,18 +495,18 @@ class TestBaseNameRename(TestCase): warnings.simplefilter('always') router.register('mock', MockViewSet, 'mock', base_name='mock') - msg = "The `base_name` argument has been deprecated in favor of `basename`." + msg = "The `base_name` argument is pending deprecation in favor of `basename`." assert len(w) == 1 assert str(w[0].message) == msg def test_base_name_argument_deprecation(self): router = SimpleRouter() - with warnings.catch_warnings(record=True) as w: + with pytest.warns(PendingDeprecationWarning) as w: warnings.simplefilter('always') router.register('mock', MockViewSet, base_name='mock') - msg = "The `base_name` argument has been deprecated in favor of `basename`." + msg = "The `base_name` argument is pending deprecation in favor of `basename`." assert len(w) == 1 assert str(w[0].message) == msg assert router.registry == [ @@ -529,7 +529,7 @@ class TestBaseNameRename(TestCase): msg = "`CustomRouter.get_default_base_name` method should be renamed `get_default_basename`." # Class definition should raise a warning - with warnings.catch_warnings(record=True) as w: + with pytest.warns(PendingDeprecationWarning) as w: warnings.simplefilter('always') class CustomRouter(SimpleRouter):