encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 11:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle "suffix" used in action decorator kwargs

Browse Source 
With 0148a9f8d you would get a TypeError when using "suffix" in an
action decorator.

This might get improved to take suffix as a keyword argument already,
defaulting to `None`.
This commit is contained in:
Daniel Hahler 2018-07-10 13:55:17 +02:00
parent 0484d01aae
commit cefc47890a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/decorators.py
View File

@ -154,9 +154,12 @@ def action(methods=None, detail=None, name=None, url_path=None, url_name=None, *
func.url_name = url_name if url_name else func.__name__.replace('_', '-') func.url_name = url_name if url_name else func.__name__.replace('_', '-')
func.kwargs = kwargs func.kwargs = kwargs
func.kwargs.update({ func.kwargs.update({
'name': func.name,
'description': func.__doc__ or None 'description': func.__doc__ or None
}) })
if 'suffix' not in kwargs:
func.kwargs.update({
'name': func.name,
})
return func return func
return decorator return decorator