diff options
| author | Xavier Ordoquy | 2015-01-21 19:29:40 +0100 | 
|---|---|---|
| committer | Xavier Ordoquy | 2015-01-21 19:29:40 +0100 | 
| commit | 857185cf07bb539083a90bc75a6dd951da8e2206 (patch) | |
| tree | cdff87c19822aea40ae1596a26c9588a2cf0b195 /rest_framework | |
| parent | a7567efa8d6fd008ba0a48f0e8fa7028703af386 (diff) | |
| download | django-rest-framework-857185cf07bb539083a90bc75a6dd951da8e2206.tar.bz2 | |
Workaround Django issue 24198.
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/serializers.py | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 6320a075..b1474562 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -12,7 +12,7 @@ response content is handled by parsers and renderers.  """  from __future__ import unicode_literals  from django.db import models -from django.db.models.fields import FieldDoesNotExist +from django.db.models.fields import FieldDoesNotExist, Field  from django.utils.translation import ugettext_lazy as _  from rest_framework.compat import unicode_to_repr  from rest_framework.utils import model_meta @@ -939,6 +939,9 @@ class ModelSerializer(Serializer):              except FieldDoesNotExist:                  continue +            if not isinstance(model_field, Field): +                continue +              # Include each of the `unique_for_*` field names.              unique_constraint_names |= set([                  model_field.unique_for_date, | 
