From 5191b6c130cdf0d4c759a90d456b609cd41cb476 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Mon, 28 Dec 2015 17:00:47 +0100 Subject: [PATCH] Also remove showfields imports from __init__.py If we're to cause pain, let it be once. --- polymorphic/__init__.py | 5 +---- polymorphic/tests.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/polymorphic/__init__.py b/polymorphic/__init__.py index a16661c..22373d9 100644 --- a/polymorphic/__init__.py +++ b/polymorphic/__init__.py @@ -6,13 +6,10 @@ Copyright: This code and affiliated files are (C) by Bert Constantin and individual contributors. Please see LICENSE and AUTHORS for more information. """ -from __future__ import absolute_import -import django -from .showfields import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent -from .showfields import ShowFields, ShowFieldTypes, ShowFieldsAndTypes # import old names for compatibility # Monkey-patch Django < 1.5 to allow ContentTypes for proxy models. +import django if django.VERSION[:2] < (1, 5): from django.contrib.contenttypes.models import ContentTypeManager from django.utils.encoding import smart_text diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 0bd1e17..f11f9cd 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -22,7 +22,7 @@ from django.utils import six from polymorphic.models import PolymorphicModel from polymorphic.managers import PolymorphicManager from polymorphic.query import PolymorphicQuerySet -from polymorphic import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent +from polymorphic.showfields import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent try: from django.db.models import UUIDField except ImportError: