diff --git a/wagtail/wagtailimages/backends/__init__.py b/wagtail/wagtailimages/backends/__init__.py index 62d0c1c78..e60b89688 100644 --- a/wagtail/wagtailimages/backends/__init__.py +++ b/wagtail/wagtailimages/backends/__init__.py @@ -8,11 +8,15 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module -from django.utils import six import sys -from django.conf import settings -from base import InvalidImageBackendError +from django.utils import six +from django.conf import settings +from django.core.exceptions import ImproperlyConfigured + + +class InvalidImageBackendError(ImproperlyConfigured): + pass # Pinched from django 1.7 source code. # TODO: Replace this with "from django.utils.module_loading import import_string" diff --git a/wagtail/wagtailimages/backends/base.py b/wagtail/wagtailimages/backends/base.py index ce07420e3..7024c358d 100644 --- a/wagtail/wagtailimages/backends/base.py +++ b/wagtail/wagtailimages/backends/base.py @@ -1,9 +1,4 @@ from django.conf import settings -from django.core.exceptions import ImproperlyConfigured - - -class InvalidImageBackendError(ImproperlyConfigured): - pass class BaseImageBackend(object): diff --git a/wagtail/wagtailredirects/middleware.py b/wagtail/wagtailredirects/middleware.py index 6fdd6fa27..e65d1be98 100644 --- a/wagtail/wagtailredirects/middleware.py +++ b/wagtail/wagtailredirects/middleware.py @@ -1,6 +1,6 @@ from django import http -import models +from wagtail.wagtailredirects import models # Originally pinched from: https://github.com/django/django/blob/master/django/contrib/redirects/middleware.py diff --git a/wagtail/wagtailredirects/views.py b/wagtail/wagtailredirects/views.py index 8dfd687f1..2a57ae57b 100644 --- a/wagtail/wagtailredirects/views.py +++ b/wagtail/wagtailredirects/views.py @@ -8,7 +8,7 @@ from django.views.decorators.vary import vary_on_headers from wagtail.wagtailadmin.edit_handlers import ObjectList from wagtail.wagtailadmin.forms import SearchForm -import models +from wagtail.wagtailredirects import models REDIRECT_EDIT_HANDLER = ObjectList(models.Redirect.content_panels) diff --git a/wagtail/wagtailsearch/__init__.py b/wagtail/wagtailsearch/__init__.py index 2b074bd9c..ed896f445 100644 --- a/wagtail/wagtailsearch/__init__.py +++ b/wagtail/wagtailsearch/__init__.py @@ -1,3 +1,3 @@ -from indexed import Indexed -from signal_handlers import register_signal_handlers -from backends import get_search_backend \ No newline at end of file +from wagtail.wagtailsearch.indexed import Indexed +from wagtail.wagtailsearch.signal_handlers import register_signal_handlers +from wagtail.wagtailsearch.backends import get_search_backend \ No newline at end of file diff --git a/wagtail/wagtailsearch/backends/__init__.py b/wagtail/wagtailsearch/backends/__init__.py index 5e1b4fc5d..cf33cf5c1 100644 --- a/wagtail/wagtailsearch/backends/__init__.py +++ b/wagtail/wagtailsearch/backends/__init__.py @@ -8,10 +8,15 @@ except ImportError: # for Python 2.6, fall back on django.utils.importlib (deprecated as of Django 1.7) from django.utils.importlib import import_module -from django.utils import six import sys + +from django.utils import six from django.conf import settings -from base import InvalidSearchBackendError +from django.core.exceptions import ImproperlyConfigured + + +class InvalidSearchBackendError(ImproperlyConfigured): + pass # Pinched from django 1.7 source code. diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/wagtailsearch/backends/base.py index 689be7bbe..393ecae1b 100644 --- a/wagtail/wagtailsearch/backends/base.py +++ b/wagtail/wagtailsearch/backends/base.py @@ -1,13 +1,8 @@ from django.db import models -from django.core.exceptions import ImproperlyConfigured from wagtail.wagtailsearch.indexed import Indexed -class InvalidSearchBackendError(ImproperlyConfigured): - pass - - class BaseSearch(object): def __init__(self, params): pass diff --git a/wagtail/wagtailsearch/forms.py b/wagtail/wagtailsearch/forms.py index 9485e4619..aaffad052 100644 --- a/wagtail/wagtailsearch/forms.py +++ b/wagtail/wagtailsearch/forms.py @@ -1,7 +1,8 @@ from django import forms from django.forms.models import inlineformset_factory from django.utils.translation import ugettext_lazy as _ -import models + +from wagtail.wagtailsearch import models class QueryForm(forms.Form): diff --git a/wagtail/wagtailsearch/views/__init__.py b/wagtail/wagtailsearch/views/__init__.py index 46e2526f6..7f39327bd 100644 --- a/wagtail/wagtailsearch/views/__init__.py +++ b/wagtail/wagtailsearch/views/__init__.py @@ -1 +1 @@ -from frontend import search \ No newline at end of file +from wagtail.wagtailsearch.views.frontend import search \ No newline at end of file