encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-31 16:07:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Weakened to PendingDeprecationWarning for base_name

Browse Source 
cc @rpkilby.
This commit is contained in:
Carlton Gibson 2018-10-02 12:19:00 +02:00
parent cfd73825a8
commit 06d89441a6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/routers.py
View File

@ -77,7 +77,7 @@ def flatten(list_of_lists):
class RenameRouterMethods(RenameMethodsBase): class RenameRouterMethods(RenameMethodsBase):
renamed_methods = ( 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): def register(self, prefix, viewset, basename=None, base_name=None):
if base_name is not None: if base_name is not None:
msg = "The `base_name` argument has been deprecated in favor of `basename`." msg = "The `base_name` argument is pending deprecation in favor of `basename`."
warnings.warn(msg, DeprecationWarning, 2) warnings.warn(msg, PendingDeprecationWarning, 2)
assert not (basename and base_name), ( assert not (basename and base_name), (
"Do not provide both the `basename` and `base_name` arguments.") "Do not provide both the `basename` and `base_name` arguments.")

8
tests/test_routers.py
View File

@ -495,18 +495,18 @@ class TestBaseNameRename(TestCase):
warnings.simplefilter('always') warnings.simplefilter('always')
router.register('mock', MockViewSet, 'mock', base_name='mock') 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 len(w) == 1
assert str(w[0].message) == msg assert str(w[0].message) == msg
def test_base_name_argument_deprecation(self): def test_base_name_argument_deprecation(self):
router = SimpleRouter() router = SimpleRouter()
with warnings.catch_warnings(record=True) as w: with pytest.warns(PendingDeprecationWarning) as w:
warnings.simplefilter('always') warnings.simplefilter('always')
router.register('mock', MockViewSet, base_name='mock') 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 len(w) == 1
assert str(w[0].message) == msg assert str(w[0].message) == msg
assert router.registry == [ assert router.registry == [
@ -529,7 +529,7 @@ class TestBaseNameRename(TestCase):
msg = "`CustomRouter.get_default_base_name` method should be renamed `get_default_basename`." msg = "`CustomRouter.get_default_base_name` method should be renamed `get_default_basename`."
# Class definition should raise a warning # Class definition should raise a warning
with warnings.catch_warnings(record=True) as w: with pytest.warns(PendingDeprecationWarning) as w:
warnings.simplefilter('always') warnings.simplefilter('always')
class CustomRouter(SimpleRouter): class CustomRouter(SimpleRouter):