encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 16:40:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into error-details-tuple

Browse Source
This commit is contained in:
Sebastian Jordan 2020-11-30 11:53:08 +01:00
commit aa77a399cd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/api-guide/authentication.md
View File

@ -60,8 +60,8 @@ using the `APIView` class-based views.
def get(self, request, format=None): def get(self, request, format=None):
content = { content = {
'user': unicode(request.user), # `django.contrib.auth.User` instance. 'user': str(request.user), # `django.contrib.auth.User` instance.
'auth': unicode(request.auth), # None 'auth': str(request.auth), # None
} }
return Response(content) return Response(content)
@ -72,8 +72,8 @@ Or, if you're using the `@api_view` decorator with function based views.
@permission_classes([IsAuthenticated]) @permission_classes([IsAuthenticated])
def example_view(request, format=None): def example_view(request, format=None):
content = { content = {
'user': unicode(request.user), # `django.contrib.auth.User` instance. 'user': str(request.user), # `django.contrib.auth.User` instance.
'auth': unicode(request.auth), # None 'auth': str(request.auth), # None
} }
return Response(content) return Response(content)

2
docs/api-guide/serializers.md
View File

@ -282,7 +282,7 @@ If a nested representation may optionally accept the `None` value you should pas
content = serializers.CharField(max_length=200) content = serializers.CharField(max_length=200)
created = serializers.DateTimeField() created = serializers.DateTimeField()
Similarly if a nested representation should be a list of items, you should pass the `many=True` flag to the nested serialized. Similarly if a nested representation should be a list of items, you should pass the `many=True` flag to the nested serializer.
class CommentSerializer(serializers.Serializer): class CommentSerializer(serializers.Serializer):
user = UserSerializer(required=False) user = UserSerializer(required=False)