From 8b390da876c6c9fc859e1670ee8a8aae6cb84c81 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Wed, 23 Sep 2015 23:13:34 +0200 Subject: [PATCH] 'django.contrib.contenttypes.generic' was replaced by 'django.contrib.contenttypes.fields' for backwards compatibility, also import from the old location --- tests/test_relations_generic.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tests/test_relations_generic.py b/tests/test_relations_generic.py index 962857365..3cef68148 100644 --- a/tests/test_relations_generic.py +++ b/tests/test_relations_generic.py @@ -1,8 +1,15 @@ from __future__ import unicode_literals -from django.contrib.contenttypes.generic import ( - GenericForeignKey, GenericRelation -) +try: + 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.db import models from django.test import TestCase