encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-22 22:43:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

add compatibility for django 1.6

Browse Source
This commit is contained in:
kazmiruk 2015-04-22 20:05:10 +07:00
parent b3e03cd8e2
commit 1116a534d4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/serializers.py
View File

@ -16,7 +16,7 @@ import datetime
import inspect import inspect
import types import types
from decimal import Decimal from decimal import Decimal
from django.contrib.contenttypes.fields import GenericForeignKey import django
from django.core.paginator import Page from django.core.paginator import Page
from django.db import models from django.db import models
from django.forms import widgets from django.forms import widgets
@ -41,6 +41,11 @@ try:
except ImportError: except ImportError:
from django.utils.datastructures import SortedDict as OrderedDict 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): def _resolve_model(obj):
""" """