Generate schema with respect to http_method_names provided by CBV #5085
Conversation
|
Hi @hurturk. Thanks for your contribution ! Do you think you could get a test case along with the PR ? |
|
Hi @xordoquy, I already included a test case that overrides ExampleViewSet to remove permission classes and to specify |
|
@hurturk woops, indeed. I'm getting some more coffee and I'm sorry for the previous comment. |
rest_framework/schemas.py
Outdated
| return [method.upper() for method in callback.actions.keys()] | ||
| return [ | ||
| method.upper() for method in | ||
| set(callback.actions.keys()).intersection(set(callback.cls().http_method_names)) |
There was a problem hiding this comment.
There's too much going on inline here.
I'd suggest:
- Pull each of those two sets out into variable assignments.
- Use the
&operator, rather then.intersection(...)
|
Hi @tomchristie, thank you for taking time on this. I have moved them to variables as you've pointed, hope that looks better. |
rest_framework/schemas.py
Outdated
| @@ -246,7 +246,9 @@ def get_allowed_methods(self, callback): | |||
| Return a list of the valid HTTP methods for this endpoint. | |||
| """ | |||
| if hasattr(callback, 'actions'): | |||
| return [method.upper() for method in callback.actions.keys()] | |||
| actions = set(callback.actions.keys()) | |||
| http_method_names = set(callback.cls().http_method_names) | |||
There was a problem hiding this comment.
We shouldn't need to instantiate the class, right?
There was a problem hiding this comment.
Right, looks defensive. I will remove that quick.
|
Seems good to me, yup. Don't think I'd realised that |
|
Thanks for your time on this! |
Description
This limits the schema generation by
http_method_namesattribute (Django CBV). I just updatedget_allowed_methodto have a set intersection check.Closes #4691.