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

Merge pull request #2441 from linovia/bugfix/2425

Browse Source 
Support for Django 1.8a1
This commit is contained in:
Tom Christie 2015-01-23 09:50:10 +00:00
commit e56f0a928c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/serializers.py
View File

@ -12,7 +12,7 @@ response content is handled by parsers and renderers.
""" """
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models from django.db import models
from django.db.models.fields import FieldDoesNotExist from django.db.models.fields import FieldDoesNotExist, Field as DjangoField
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import unicode_to_repr from rest_framework.compat import unicode_to_repr
from rest_framework.utils import model_meta from rest_framework.utils import model_meta
@ -939,6 +939,9 @@ class ModelSerializer(Serializer):
except FieldDoesNotExist: except FieldDoesNotExist:
continue continue
if not isinstance(model_field, DjangoField):
continue
# Include each of the `unique_for_*` field names. # Include each of the `unique_for_*` field names.
unique_constraint_names |= set([ unique_constraint_names |= set([
model_field.unique_for_date, model_field.unique_for_date,