aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ordoquy2015-01-21 19:46:31 +0100
committerXavier Ordoquy2015-01-21 19:46:31 +0100
commit15f797fd3ec61947aaecc05e6fd040e1e3e8776a (patch)
treedd34b19797b6a178585cd4c469ea395628cc4bec
parent857185cf07bb539083a90bc75a6dd951da8e2206 (diff)
downloaddjango-rest-framework-15f797fd3ec61947aaecc05e6fd040e1e3e8776a.tar.bz2
Owned by import *
-rw-r--r--rest_framework/serializers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index b1474562..cf797bdc 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, Field
+from django.db.models.fields import FieldDoesNotExist, Field as DjangoField
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import unicode_to_repr
from rest_framework.utils import model_meta
@@ -939,7 +939,7 @@ class ModelSerializer(Serializer):
except FieldDoesNotExist:
continue
- if not isinstance(model_field, Field):
+ if not isinstance(model_field, DjangoField):
continue
# Include each of the `unique_for_*` field names.