encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 03:54:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Oscar Vilaplana 2013-05-19 15:18:40 +02:00
commit 6bbedfd7ae
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/tests/fields.py
View File

@ -846,7 +846,7 @@ class HumanizedFieldType(TestCase):
""" """
self.assertIsInstance(humanized, unicode) self.assertIsInstance(humanized, unicode)
self.assertTrue(humanized) self.assertNotEqual(humanized, '')
class HumanizedField(TestCase): class HumanizedField(TestCase):

2
rest_framework/tests/views.py
View File

@ -11,7 +11,6 @@ from rest_framework.response import Response
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
from rest_framework.views import APIView from rest_framework.views import APIView
factory = RequestFactory() factory = RequestFactory()
@ -102,4 +101,3 @@ class FunctionBasedViewIntegrationTests(TestCase):
} }
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertEqual(sanitise_json_error(response.data), expected) self.assertEqual(sanitise_json_error(response.data), expected)

4
rest_framework/views.py
View File

@ -68,9 +68,9 @@ class APIView(View):
return content return content
def _generate_action_metadata(self, request): def _generate_action_metadata(self, request):
''' """
Helper for generating the fields metadata for allowed and permitted methods. Helper for generating the fields metadata for allowed and permitted methods.
''' """
actions = {} actions = {}
for method in self.allowed_methods: for method in self.allowed_methods:
# skip HEAD and OPTIONS # skip HEAD and OPTIONS