Fixes for Django 1.9

bimusiek · bimusiek · commit 044fefa420c1 · 2016-03-08T19:54:30.000+01:00
diff --git a/rest_framework/response.py b/rest_framework/response.py
@@ -6,10 +6,9 @@
 """
 from __future__ import unicode_literals
 import django
-from django.core.handlers.wsgi import STATUS_CODE_TEXT
 from django.template.response import SimpleTemplateResponse
 from django.utils import six
-
+import httplib
 
 class Response(SimpleTemplateResponse):
     """
@@ -81,7 +80,7 @@ def status_text(self):
         """
         # TODO: Deprecate and use a template tag instead
         # 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):
         """
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -1081,7 +1081,10 @@ def save_object(self, obj, **kwargs):
                     self.save_object(related)
                 else:
                     # Reverse FK or reverse one-one
-                    setattr(obj, accessor_name, related)
+                    try:
+                        setattr(obj, accessor_name, related)
+                    except ValueError:
+                        getattr(obj, accessor_name).add(*related, bulk=False)
             del(obj._related_data)
 
 
