diff options
| author | Oscar Vilaplana | 2013-05-19 15:18:40 +0200 |
|---|---|---|
| committer | Oscar Vilaplana | 2013-05-19 15:18:40 +0200 |
| commit | 6bbedfd7ae25655d94281764cb375fc7c2d0c13a (patch) | |
| tree | 4d23d8e886312c92a8796647118d48bf1075d5a2 /rest_framework/views.py | |
| parent | e80488b6192580c7a731114e58edd718d1c79120 (diff) | |
| parent | 31893cff745b8cb62c3cc98b7103af2860eca319 (diff) | |
| download | django-rest-framework-6bbedfd7ae25655d94281764cb375fc7c2d0c13a.tar.bz2 | |
fixed merge conflict
Diffstat (limited to 'rest_framework/views.py')
| -rw-r--r-- | rest_framework/views.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/views.py b/rest_framework/views.py index 1af4c0ba..1c4854f0 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -68,9 +68,9 @@ class APIView(View): return content def _generate_action_metadata(self, request): - ''' + """ Helper for generating the fields metadata for allowed and permitted methods. - ''' + """ actions = {} for method in self.allowed_methods: # skip HEAD and OPTIONS |