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

Fix Django 1.10 to-many deprecation

Browse Source
This commit is contained in:
Ryan P Kilby 2016-09-14 23:44:48 -04:00
parent a68b37d8bc
commit 8609c9ca8c
4 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/compat.py
View File

@ -277,3 +277,11 @@ def template_render(template, context=None, request=None):
# backends template, e.g. django.template.backends.django.Template # backends template, e.g. django.template.backends.django.Template
else: else:
return template.render(context, request=request) return template.render(context, request=request)
def set_many(instance, field, value):
if django.VERSION < (1, 10):
setattr(instance, field, value)
else:
field = getattr(instance, field)
field.set(value)

10
rest_framework/serializers.py
View File

@ -23,7 +23,7 @@ from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import JSONField as ModelJSONField from rest_framework.compat import JSONField as ModelJSONField
from rest_framework.compat import postgres_fields, unicode_to_repr from rest_framework.compat import postgres_fields, set_many, unicode_to_repr
from rest_framework.utils import model_meta from rest_framework.utils import model_meta
from rest_framework.utils.field_mapping import ( from rest_framework.utils.field_mapping import (
ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs, ClassLookupDict, get_field_kwargs, get_nested_relation_kwargs,
@ -892,19 +892,23 @@ class ModelSerializer(Serializer):
# Save many-to-many relationships after the instance is created. # Save many-to-many relationships after the instance is created.
if many_to_many: if many_to_many:
for field_name, value in many_to_many.items(): for field_name, value in many_to_many.items():
setattr(instance, field_name, value) set_many(instance, field_name, value)
return instance return instance
def update(self, instance, validated_data): def update(self, instance, validated_data):
raise_errors_on_nested_writes('update', self, validated_data) raise_errors_on_nested_writes('update', self, validated_data)
info = model_meta.get_field_info(instance)
# Simply set each attribute on the instance, and then save it. # Simply set each attribute on the instance, and then save it.
# Note that unlike `.create()` we don't need to treat many-to-many # Note that unlike `.create()` we don't need to treat many-to-many
# relationships as being a special case. During updates we already # relationships as being a special case. During updates we already
# have an instance pk for the relationships to be associated with. # have an instance pk for the relationships to be associated with.
for attr, value in validated_data.items(): for attr, value in validated_data.items():
setattr(instance, attr, value) if attr in info.relations and info.relations[attr].to_many:
set_many(instance, attr, value)
else:
setattr(instance, attr, value)
instance.save() instance.save()
return instance return instance

4
tests/test_model_serializer.py
View File

@ -20,7 +20,7 @@ from django.test import TestCase
from django.utils import six from django.utils import six
from rest_framework import serializers from rest_framework import serializers
from rest_framework.compat import unicode_repr from rest_framework.compat import set_many, unicode_repr
def dedent(blocktext): def dedent(blocktext):
@ -651,7 +651,7 @@ class TestIntegration(TestCase):
foreign_key=self.foreign_key_target, foreign_key=self.foreign_key_target,
one_to_one=self.one_to_one_target, one_to_one=self.one_to_one_target,
) )
self.instance.many_to_many = self.many_to_many_targets set_many(self.instance, 'many_to_many', self.many_to_many_targets)
self.instance.save() self.instance.save()
def test_pk_retrival(self): def test_pk_retrival(self):

10
tests/test_permissions.py
View File

@ -12,7 +12,7 @@ from rest_framework import (
HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers, HTTP_HEADER_ENCODING, authentication, generics, permissions, serializers,
status status
) )
from rest_framework.compat import guardian from rest_framework.compat import guardian, set_many
from rest_framework.filters import DjangoObjectPermissionsFilter from rest_framework.filters import DjangoObjectPermissionsFilter
from rest_framework.routers import DefaultRouter from rest_framework.routers import DefaultRouter
from rest_framework.test import APIRequestFactory from rest_framework.test import APIRequestFactory
@ -74,15 +74,15 @@ class ModelPermissionsIntegrationTests(TestCase):
def setUp(self): def setUp(self):
User.objects.create_user('disallowed', 'disallowed@example.com', 'password') User.objects.create_user('disallowed', 'disallowed@example.com', 'password')
user = User.objects.create_user('permitted', 'permitted@example.com', 'password') user = User.objects.create_user('permitted', 'permitted@example.com', 'password')
user.user_permissions = [ set_many(user, 'user_permissions', [
Permission.objects.get(codename='add_basicmodel'), Permission.objects.get(codename='add_basicmodel'),
Permission.objects.get(codename='change_basicmodel'), Permission.objects.get(codename='change_basicmodel'),
Permission.objects.get(codename='delete_basicmodel') Permission.objects.get(codename='delete_basicmodel')
] ])
user = User.objects.create_user('updateonly', 'updateonly@example.com', 'password') user = User.objects.create_user('updateonly', 'updateonly@example.com', 'password')
user.user_permissions = [ set_many(user, 'user_permissions', [
Permission.objects.get(codename='change_basicmodel'), Permission.objects.get(codename='change_basicmodel'),
] ])
self.permitted_credentials = basic_auth_header('permitted', 'password') self.permitted_credentials = basic_auth_header('permitted', 'password')
self.disallowed_credentials = basic_auth_header('disallowed', 'password') self.disallowed_credentials = basic_auth_header('disallowed', 'password')