Fix import errors with Django 1.6 code
parent
66619371fd
commit
b691533039
|
|
@ -1,10 +1,14 @@
|
||||||
from django.contrib.contenttypes.admin import GenericInlineModelAdmin
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.utils.functional import cached_property
|
from django.utils.functional import cached_property
|
||||||
|
|
||||||
from polymorphic.formsets import polymorphic_child_forms_factory, BaseGenericPolymorphicInlineFormSet, GenericPolymorphicFormSetChild
|
from polymorphic.formsets import polymorphic_child_forms_factory, BaseGenericPolymorphicInlineFormSet, GenericPolymorphicFormSetChild
|
||||||
from .inlines import PolymorphicInlineModelAdmin
|
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):
|
class GenericPolymorphicInlineModelAdmin(PolymorphicInlineModelAdmin, GenericInlineModelAdmin):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ Each row in the inline can correspond with a different subclass.
|
||||||
from functools import partial
|
from functools import partial
|
||||||
|
|
||||||
from django.contrib.admin.options import InlineModelAdmin
|
from django.contrib.admin.options import InlineModelAdmin
|
||||||
from django.contrib.admin.utils import flatten_fieldsets
|
|
||||||
from django.core.exceptions import ImproperlyConfigured
|
from django.core.exceptions import ImproperlyConfigured
|
||||||
from django.forms import Media
|
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 polymorphic.formsets.utils import add_media
|
||||||
from .helpers import PolymorphicInlineSupportMixin
|
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):
|
class PolymorphicInlineModelAdmin(InlineModelAdmin):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,15 @@
|
||||||
import django
|
import django
|
||||||
from django.contrib.contenttypes.forms import BaseGenericInlineFormSet, generic_inlineformset_factory
|
|
||||||
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.forms.models import ModelForm
|
from django.forms.models import ModelForm
|
||||||
|
|
||||||
from .models import BasePolymorphicModelFormSet, polymorphic_child_forms_factory, PolymorphicFormSetChild
|
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):
|
class GenericPolymorphicFormSetChild(PolymorphicFormSetChild):
|
||||||
"""
|
"""
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue