From 1116a534d447998b46089a0e0e699e76a97fd87f Mon Sep 17 00:00:00 2001 From: kazmiruk Date: Wed, 22 Apr 2015 20:05:10 +0700 Subject: [PATCH] add compatibility for django 1.6 --- rest_framework/serializers.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index ceab6111f..34f9f6fcc 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -16,7 +16,7 @@ import datetime import inspect import types from decimal import Decimal -from django.contrib.contenttypes.fields import GenericForeignKey +import django from django.core.paginator import Page from django.db import models from django.forms import widgets @@ -41,6 +41,11 @@ try: except ImportError: from django.utils.datastructures import SortedDict as OrderedDict +if django.VERSION >= (1, 8): + from django.contrib.contenttypes.fields import GenericForeignKey +else: + from django.contrib.contenttypes.generic import GenericForeignKey + def _resolve_model(obj): """