aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2015-01-23 14:56:15 +0000
committerTom Christie2015-01-23 14:56:15 +0000
commit8f25c0c53c24c88afc86d99bbb3ca4edc3a4e0a2 (patch)
treee78b686ecf82bd1adeadbd866d3ad1e3e6c96e22
parent39f26c9eca6fa8b749f9197ad78e5cba69870e50 (diff)
downloaddjango-rest-framework-8f25c0c53c24c88afc86d99bbb3ca4edc3a4e0a2.tar.bz2
Add 1.8 support
-rw-r--r--rest_framework/serializers.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index b91ecebc..d9a67441 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 as DjangoModelField
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import unicode_to_repr
from rest_framework.utils import model_meta
@@ -1231,7 +1231,9 @@ class ModelSerializer(Serializer):
continue
try:
- model_fields[source] = model._meta.get_field(source)
+ field = model._meta.get_field(source)
+ if isinstance(field, DjangoModelField):
+ model_fields[source] = field
except FieldDoesNotExist:
pass