Merge pull request encode#3981 from Inventorum/inventorum

xordoquy · xordoquy · commit 4f252086df0b · 2016-03-22T19:45:17.000+01:00
[2.4] Fixes for Django 1.9
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,8 @@ env:
     - TOX_ENV=py2.6-django1.4
 
 install:
-  - "pip install tox --download-cache $HOME/.pip-cache"
+# Virtualenv < 14 is required to keep the Python 3.2 builds running.
+  - "pip install tox 'virtualenv<14' --download-cache $HOME/.pip-cache"
 
 script:
     - tox -e $TOX_ENV
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
@@ -8,7 +8,7 @@
 """
 
 __title__ = 'Django REST framework'
-__version__ = '2.4.8'
+__version__ = '2.4.9'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2014 Tom Christie'
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
@@ -73,6 +73,12 @@
     from collections import UserDict
     from collections import MutableMapping as DictMixin
 
+# http responses move in Python 3
+try:
+    from httplib import responses
+except ImportError:
+    from http.client import responses
+
 # Try to import PIL in either of the two ways it can end up installed.
 try:
     from PIL import Image
diff --git a/rest_framework/response.py b/rest_framework/response.py
@@ -6,9 +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
+from rest_framework.compat import responses
 
 
 class Response(SimpleTemplateResponse):
@@ -81,7 +81,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 responses.get(self.status_code, '')
 
     def __getstate__(self):
         """
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
@@ -15,6 +15,9 @@
 import datetime
 import inspect
 import types
+
+import django
+
 from decimal import Decimal
 from django.core.paginator import Page
 from django.db import models
@@ -1079,6 +1082,12 @@ def save_object(self, obj, **kwargs):
                     fk_field = obj._meta.get_field_by_name(accessor_name)[0].field.name
                     setattr(related, fk_field, obj)
                     self.save_object(related)
+                elif isinstance(related, list):
+                    # Many to One/Many
+                    if django.VERSION >= (1, 9):
+                        getattr(obj, accessor_name).add(*related, bulk=False)
+                    else:
+                        getattr(obj, accessor_name).add(*related)
                 else:
                     # Reverse FK or reverse one-one
                     setattr(obj, accessor_name, related)
