encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-08 14:24:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 8b390da876 into c28bc9896e

Browse Source
This commit is contained in:
Mads Jensen 2015-09-24 06:47:06 +00:00
commit 3e7b9a5d7b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_relations_generic.py
View File

@ -1,8 +1,15 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.contrib.contenttypes.generic import ( try:
GenericForeignKey, GenericRelation from django.contrib.contenttypes.fields import (
) GenericForeignKey, GenericRelation
)
except ImportError:
# in Django 1.6 and earlier, this was in generic
from django.contrib.contenttypes.generic import (
GenericForeignKey, GenericRelation
)
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.db import models from django.db import models
from django.test import TestCase from django.test import TestCase