From cefc47890a7c3b14d28bba7231f79745ed87706e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 10 Jul 2018 13:55:17 +0200 Subject: [PATCH] Handle "suffix" used in action decorator kwargs 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`. --- rest_framework/decorators.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rest_framework/decorators.py b/rest_framework/decorators.py index 60078947f..44ecb4b9d 100644 --- a/rest_framework/decorators.py +++ b/rest_framework/decorators.py @@ -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.kwargs = kwargs func.kwargs.update({ - 'name': func.name, 'description': func.__doc__ or None }) + if 'suffix' not in kwargs: + func.kwargs.update({ + 'name': func.name, + }) return func return decorator