From b691533039a2a366cbd00dd5ea3c10368fbce8d3 Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Fri, 3 Feb 2017 22:03:36 +0100
Subject: [PATCH] Fix import errors with Django 1.6 code

---
 polymorphic/admin/generic.py    | 6 +++++-
 polymorphic/admin/inlines.py    | 6 +++++-
 polymorphic/formsets/generic.py | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/polymorphic/admin/generic.py b/polymorphic/admin/generic.py
index bd3453f..4a121af 100644
--- a/polymorphic/admin/generic.py
+++ b/polymorphic/admin/generic.py
@@ -1,10 +1,14 @@
-from django.contrib.contenttypes.admin import GenericInlineModelAdmin
 from django.contrib.contenttypes.models import ContentType
 from django.utils.functional import cached_property
 
 from polymorphic.formsets import polymorphic_child_forms_factory, BaseGenericPolymorphicInlineFormSet, GenericPolymorphicFormSetChild
 from .inlines import PolymorphicInlineModelAdmin
 
+try:
+    from django.contrib.contenttypes.admin import GenericInlineModelAdmin  # Django 1.7+
+except ImportError:
+    from django.contrib.contenttypes.generic import GenericInlineModelAdmin
+
 
 class GenericPolymorphicInlineModelAdmin(PolymorphicInlineModelAdmin, GenericInlineModelAdmin):
     """
diff --git a/polymorphic/admin/inlines.py b/polymorphic/admin/inlines.py
index 7f64d5c..1a1d434 100644
--- a/polymorphic/admin/inlines.py
+++ b/polymorphic/admin/inlines.py
@@ -6,7 +6,6 @@ Each row in the inline can correspond with a different subclass.
 from functools import partial
 
 from django.contrib.admin.options import InlineModelAdmin
-from django.contrib.admin.utils import flatten_fieldsets
 from django.core.exceptions import ImproperlyConfigured
 from django.forms import Media
 
@@ -14,6 +13,11 @@ from polymorphic.formsets import polymorphic_child_forms_factory, BasePolymorphi
 from polymorphic.formsets.utils import add_media
 from .helpers import PolymorphicInlineSupportMixin
 
+try:
+    from django.contrib.admin.utils import flatten_fieldsets  # Django 1.7+
+except ImportError:
+    from django.contrib.admin.util import flatten_fieldsets
+
 
 class PolymorphicInlineModelAdmin(InlineModelAdmin):
     """
diff --git a/polymorphic/formsets/generic.py b/polymorphic/formsets/generic.py
index c085757..90c0ec1 100644
--- a/polymorphic/formsets/generic.py
+++ b/polymorphic/formsets/generic.py
@@ -1,11 +1,15 @@
 import django
-from django.contrib.contenttypes.forms import BaseGenericInlineFormSet, generic_inlineformset_factory
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.forms.models import ModelForm
 
 from .models import BasePolymorphicModelFormSet, polymorphic_child_forms_factory, PolymorphicFormSetChild
 
+try:
+    from django.contrib.contenttypes.forms import BaseGenericInlineFormSet, generic_inlineformset_factory  # Django 1.7+
+except ImportError:
+    from django.contrib.contenttypes.generic import BaseGenericInlineFormSet, generic_inlineformset_factory
+
 
 class GenericPolymorphicFormSetChild(PolymorphicFormSetChild):
     """