From 8f25c0c53c24c88afc86d99bbb3ca4edc3a4e0a2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 23 Jan 2015 14:56:15 +0000
Subject: Add 1.8 support

---
 rest_framework/serializers.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'rest_framework')

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
 
-- 
cgit v1.2.3