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

Fixes for Django 1.9

Browse Source
This commit is contained in:
Michał Hernas 2016-03-08 19:54:30 +01:00
parent 647fdb51d2
commit 044fefa420
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/response.py
View File

@ -6,10 +6,9 @@ The appropriate renderer is called during Django's template response rendering.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
import django import django
from django.core.handlers.wsgi import STATUS_CODE_TEXT
from django.template.response import SimpleTemplateResponse from django.template.response import SimpleTemplateResponse
from django.utils import six from django.utils import six
import httplib
class Response(SimpleTemplateResponse): class Response(SimpleTemplateResponse):
""" """
@ -81,7 +80,7 @@ class Response(SimpleTemplateResponse):
""" """
# TODO: Deprecate and use a template tag instead # TODO: Deprecate and use a template tag instead
# TODO: Status code text for RFC 6585 status codes # TODO: Status code text for RFC 6585 status codes
return STATUS_CODE_TEXT.get(self.status_code, '') return httplib[self.status_code]
def __getstate__(self): def __getstate__(self):
""" """

3
rest_framework/serializers.py
View File

@ -1081,7 +1081,10 @@ class ModelSerializer(Serializer):
self.save_object(related) self.save_object(related)
else: else:
# Reverse FK or reverse one-one # Reverse FK or reverse one-one
try:
setattr(obj, accessor_name, related) setattr(obj, accessor_name, related)
except ValueError:
getattr(obj, accessor_name).add(*related, bulk=False)
del(obj._related_data) del(obj._related_data)