From e656744e36c7edd8367b73cdbacb265583580555 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 3 Apr 2015 17:37:26 +0100 Subject: [PATCH] Removed unused imports --- wagtail/contrib/wagtailapi/endpoints.py | 3 --- wagtail/contrib/wagtailapi/signal_handlers.py | 1 - wagtail/contrib/wagtailapi/tests/test_documents.py | 4 ---- wagtail/contrib/wagtailapi/tests/test_images.py | 4 ---- wagtail/contrib/wagtailapi/tests/test_pages.py | 2 -- wagtail/contrib/wagtailfrontendcache/utils.py | 1 - .../core/migrations/0002_create_homepage.py | 2 +- wagtail/tests/demosite/models.py | 4 +--- wagtail/tests/routablepage/models.py | 1 - wagtail/tests/settings.py | 2 +- .../migrations/0001_create_admin_access_permissions.py | 2 +- wagtail/wagtailadmin/models.py | 2 -- wagtail/wagtailadmin/templatetags/wagtailuserbar.py | 2 -- wagtail/wagtailadmin/tests/test_pages_views.py | 1 - wagtail/wagtailadmin/tests/test_password_reset.py | 1 - wagtail/wagtailadmin/views/chooser.py | 1 - wagtail/wagtailadmin/views/pages.py | 2 -- wagtail/wagtailadmin/widgets.py | 1 - wagtail/wagtailcore/migrations/0002_initial_data.py | 2 +- .../0005_add_page_lock_permission_to_moderators.py | 2 +- .../migrations/0008_populate_latest_revision_created_at.py | 2 +- wagtail/wagtailcore/models.py | 1 - wagtail/wagtailcore/tests/test_page_model.py | 3 +-- wagtail/wagtailcore/views.py | 2 -- wagtail/wagtaildocs/migrations/0002_initial_data.py | 2 +- wagtail/wagtailembeds/embeds.py | 1 - wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py | 2 -- wagtail/wagtailembeds/tests.py | 2 +- wagtail/wagtailimages/migrations/0002_initial_data.py | 2 +- wagtail/wagtailimages/models.py | 1 - wagtail/wagtailimages/tests/test_models.py | 3 +-- wagtail/wagtailimages/tests/tests.py | 3 --- wagtail/wagtailimages/views/frontend.py | 2 +- wagtail/wagtailimages/views/multiple.py | 4 +--- wagtail/wagtailsearch/backends/base.py | 2 -- wagtail/wagtailsearch/backends/elasticsearch.py | 6 ++---- wagtail/wagtailsearch/index.py | 4 ---- wagtail/wagtailsearch/management/commands/update_index.py | 2 +- wagtail/wagtailsearch/signal_handlers.py | 2 +- wagtail/wagtailsearch/tests/test_backends.py | 1 - wagtail/wagtailsearch/tests/test_indexed_class.py | 3 --- wagtail/wagtailsearch/urls/__init__.py | 2 +- wagtail/wagtailsearch/views/__init__.py | 2 +- wagtail/wagtailsnippets/tests.py | 2 -- 44 files changed, 20 insertions(+), 76 deletions(-) diff --git a/wagtail/contrib/wagtailapi/endpoints.py b/wagtail/contrib/wagtailapi/endpoints.py index 93de40bd8..edb1d4bbf 100644 --- a/wagtail/contrib/wagtailapi/endpoints.py +++ b/wagtail/contrib/wagtailapi/endpoints.py @@ -1,6 +1,5 @@ from __future__ import absolute_import -import urllib from collections import OrderedDict from modelcluster.models import get_all_child_relations @@ -8,9 +7,7 @@ from taggit.managers import _TaggableManager from django.db import models from django.utils.encoding import force_text -from django.http import Http404 from django.shortcuts import get_object_or_404 -from django.core.paginator import Paginator, EmptyPage from django.conf.urls import url from django.conf import settings diff --git a/wagtail/contrib/wagtailapi/signal_handlers.py b/wagtail/contrib/wagtailapi/signal_handlers.py index b6ea1fde0..14b7efa4f 100644 --- a/wagtail/contrib/wagtailapi/signal_handlers.py +++ b/wagtail/contrib/wagtailapi/signal_handlers.py @@ -1,6 +1,5 @@ from django.core.urlresolvers import reverse from django.db.models.signals import post_save, post_delete -from django.conf import settings from wagtail.wagtailcore.signals import page_published, page_unpublished from wagtail.wagtailcore.models import PAGE_MODEL_CLASSES diff --git a/wagtail/contrib/wagtailapi/tests/test_documents.py b/wagtail/contrib/wagtailapi/tests/test_documents.py index ff0c82908..23edf02b4 100644 --- a/wagtail/contrib/wagtailapi/tests/test_documents.py +++ b/wagtail/contrib/wagtailapi/tests/test_documents.py @@ -1,18 +1,14 @@ import json -import unittest import mock from django.test import TestCase from django.test.utils import override_settings from django.core.urlresolvers import reverse -from django.conf import settings from wagtail.wagtaildocs.models import Document from wagtail.contrib.wagtailapi import signal_handlers -from wagtail.tests.demosite import models - class TestDocumentListing(TestCase): fixtures = ['demosite.json'] diff --git a/wagtail/contrib/wagtailapi/tests/test_images.py b/wagtail/contrib/wagtailapi/tests/test_images.py index 72237d77c..2a3ad01ce 100644 --- a/wagtail/contrib/wagtailapi/tests/test_images.py +++ b/wagtail/contrib/wagtailapi/tests/test_images.py @@ -1,18 +1,14 @@ import json -import unittest import mock from django.test import TestCase from django.test.utils import override_settings from django.core.urlresolvers import reverse -from django.conf import settings from wagtail.wagtailimages.models import get_image_model from wagtail.contrib.wagtailapi import signal_handlers -from wagtail.tests.demosite import models - class TestImageListing(TestCase): fixtures = ['demosite.json'] diff --git a/wagtail/contrib/wagtailapi/tests/test_pages.py b/wagtail/contrib/wagtailapi/tests/test_pages.py index 904b6e665..745f15390 100644 --- a/wagtail/contrib/wagtailapi/tests/test_pages.py +++ b/wagtail/contrib/wagtailapi/tests/test_pages.py @@ -1,12 +1,10 @@ import json -import unittest import mock import collections from django.test import TestCase from django.test.utils import override_settings from django.core.urlresolvers import reverse -from django.conf import settings from wagtail.wagtailcore.models import Page diff --git a/wagtail/contrib/wagtailfrontendcache/utils.py b/wagtail/contrib/wagtailfrontendcache/utils.py index 8f0217bfb..e480cd549 100644 --- a/wagtail/contrib/wagtailfrontendcache/utils.py +++ b/wagtail/contrib/wagtailfrontendcache/utils.py @@ -1,6 +1,5 @@ import logging -from django.utils import six from django.conf import settings from django.utils.module_loading import import_string from django.core.exceptions import ImproperlyConfigured diff --git a/wagtail/project_template/core/migrations/0002_create_homepage.py b/wagtail/project_template/core/migrations/0002_create_homepage.py index c83440b4d..2ebda7d17 100644 --- a/wagtail/project_template/core/migrations/0002_create_homepage.py +++ b/wagtail/project_template/core/migrations/0002_create_homepage.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def create_homepage(apps, schema_editor): diff --git a/wagtail/tests/demosite/models.py b/wagtail/tests/demosite/models.py index 2f23d1991..1b40c6aa5 100644 --- a/wagtail/tests/demosite/models.py +++ b/wagtail/tests/demosite/models.py @@ -3,7 +3,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from modelcluster.fields import ParentalKey from modelcluster.tags import ClusterTaggableManager -from taggit.models import Tag, TaggedItemBase +from taggit.models import TaggedItemBase from wagtail.wagtailcore.models import Page, Orderable from wagtail.wagtailcore.fields import RichTextField @@ -11,8 +11,6 @@ from wagtail.wagtailadmin.edit_handlers import FieldPanel, MultiFieldPanel, \ InlinePanel, PageChooserPanel from wagtail.wagtailimages.edit_handlers import ImageChooserPanel from wagtail.wagtaildocs.edit_handlers import DocumentChooserPanel -from wagtail.wagtailsnippets.models import register_snippet -from wagtail.wagtailforms.models import AbstractEmailForm, AbstractFormField from wagtail.wagtailsearch import index diff --git a/wagtail/tests/routablepage/models.py b/wagtail/tests/routablepage/models.py index 0a3c3692c..1807e937f 100644 --- a/wagtail/tests/routablepage/models.py +++ b/wagtail/tests/routablepage/models.py @@ -1,4 +1,3 @@ -from django.db import models from django.http import HttpResponse from django.conf.urls import url diff --git a/wagtail/tests/settings.py b/wagtail/tests/settings.py index 0fb085b6c..edfd888aa 100644 --- a/wagtail/tests/settings.py +++ b/wagtail/tests/settings.py @@ -120,7 +120,7 @@ AUTH_USER_MODEL = 'customuser.CustomUser' try: # Only add Elasticsearch backend if the elasticsearch-py library is installed - import elasticsearch + import elasticsearch # noqa # Import succeeded, add an Elasticsearch backend WAGTAILSEARCH_BACKENDS['elasticsearch'] = { diff --git a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py index 5f198a01d..0b32e6c10 100644 --- a/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py +++ b/wagtail/wagtailadmin/migrations/0001_create_admin_access_permissions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def create_admin_access_permissions(apps, schema_editor): diff --git a/wagtail/wagtailadmin/models.py b/wagtail/wagtailadmin/models.py index bd4b2abe9..3eff443f5 100644 --- a/wagtail/wagtailadmin/models.py +++ b/wagtail/wagtailadmin/models.py @@ -1,5 +1,3 @@ from __future__ import unicode_literals -from django.db import models - # Create your models here. diff --git a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py index b0221aabb..1e2d27477 100644 --- a/wagtail/wagtailadmin/templatetags/wagtailuserbar.py +++ b/wagtail/wagtailadmin/templatetags/wagtailuserbar.py @@ -1,5 +1,3 @@ -import warnings - from django import template from django.template.loader import render_to_string diff --git a/wagtail/wagtailadmin/tests/test_pages_views.py b/wagtail/wagtailadmin/tests/test_pages_views.py index 314a31aaf..72a2b7f9c 100644 --- a/wagtail/wagtailadmin/tests/test_pages_views.py +++ b/wagtail/wagtailadmin/tests/test_pages_views.py @@ -1,5 +1,4 @@ from datetime import timedelta -import unittest import mock from django.test import TestCase diff --git a/wagtail/wagtailadmin/tests/test_password_reset.py b/wagtail/wagtailadmin/tests/test_password_reset.py index e0a1dd1b4..6061a03bc 100644 --- a/wagtail/wagtailadmin/tests/test_password_reset.py +++ b/wagtail/wagtailadmin/tests/test_password_reset.py @@ -2,7 +2,6 @@ from django.test import TestCase, override_settings from django.core import mail from wagtail.tests.utils import WagtailTestUtils -from wagtail.wagtailcore.models import Site class TestUserPasswordReset(TestCase, WagtailTestUtils): diff --git a/wagtail/wagtailadmin/views/chooser.py b/wagtail/wagtailadmin/views/chooser.py index 8f171f141..ff8163a42 100644 --- a/wagtail/wagtailadmin/views/chooser.py +++ b/wagtail/wagtailadmin/views/chooser.py @@ -2,7 +2,6 @@ from django.contrib.contenttypes.models import ContentType from django.shortcuts import get_object_or_404, render from django.http import Http404 from django.utils.http import urlencode -from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from wagtail.wagtailadmin.modal_workflow import render_modal_workflow from wagtail.wagtailadmin.forms import SearchForm, ExternalLinkChooserForm, ExternalLinkChooserWithLinkTextForm, EmailLinkChooserForm, EmailLinkChooserWithLinkTextForm diff --git a/wagtail/wagtailadmin/views/pages.py b/wagtail/wagtailadmin/views/pages.py index e1dd99a58..b41c8ff92 100644 --- a/wagtail/wagtailadmin/views/pages.py +++ b/wagtail/wagtailadmin/views/pages.py @@ -1,5 +1,3 @@ -import warnings - from django.http import Http404, HttpResponse from django.shortcuts import render, redirect, get_object_or_404 from django.core.exceptions import ValidationError, PermissionDenied diff --git a/wagtail/wagtailadmin/widgets.py b/wagtail/wagtailadmin/widgets.py index 19c35a7e0..825d82581 100644 --- a/wagtail/wagtailadmin/widgets.py +++ b/wagtail/wagtailadmin/widgets.py @@ -5,7 +5,6 @@ import json from django.core.urlresolvers import reverse from django.forms import widgets from django.contrib.contenttypes.models import ContentType -from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from django.template.loader import render_to_string diff --git a/wagtail/wagtailcore/migrations/0002_initial_data.py b/wagtail/wagtailcore/migrations/0002_initial_data.py index 10244c24c..bfd459640 100644 --- a/wagtail/wagtailcore/migrations/0002_initial_data.py +++ b/wagtail/wagtailcore/migrations/0002_initial_data.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def initial_data(apps, schema_editor): diff --git a/wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py b/wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py index 85f99e986..0950e7d5a 100644 --- a/wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py +++ b/wagtail/wagtailcore/migrations/0005_add_page_lock_permission_to_moderators.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def add_page_lock_permission_to_moderators(apps, schema_editor): diff --git a/wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py b/wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py index 8ce90ffbe..03776f96c 100644 --- a/wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py +++ b/wagtail/wagtailcore/migrations/0008_populate_latest_revision_created_at.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def populate_latest_revision_created_at(apps, schema_editor): diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 7889a5b57..34319ac29 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import logging -import warnings import json import six diff --git a/wagtail/wagtailcore/tests/test_page_model.py b/wagtail/wagtailcore/tests/test_page_model.py index 58b8940de..892a0dbcf 100644 --- a/wagtail/wagtailcore/tests/test_page_model.py +++ b/wagtail/wagtailcore/tests/test_page_model.py @@ -1,4 +1,3 @@ -import warnings import datetime import json @@ -11,7 +10,7 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.auth import get_user_model from wagtail.wagtailcore.models import Page, Site -from wagtail.tests.testapp.models import EventPage, EventIndex, SimplePage, PageWithOldStyleRouteMethod, BusinessIndex, BusinessSubIndex, BusinessChild, StandardIndex +from wagtail.tests.testapp.models import EventPage, EventIndex, SimplePage, BusinessIndex, BusinessSubIndex, BusinessChild, StandardIndex class TestSiteRouting(TestCase): diff --git a/wagtail/wagtailcore/views.py b/wagtail/wagtailcore/views.py index f01390b83..0aa4cae57 100644 --- a/wagtail/wagtailcore/views.py +++ b/wagtail/wagtailcore/views.py @@ -1,5 +1,3 @@ -import warnings - from django.http import HttpResponse, Http404 from django.shortcuts import get_object_or_404, redirect from django.core.urlresolvers import reverse diff --git a/wagtail/wagtaildocs/migrations/0002_initial_data.py b/wagtail/wagtaildocs/migrations/0002_initial_data.py index 6ca3a0fbd..d272e9298 100644 --- a/wagtail/wagtaildocs/migrations/0002_initial_data.py +++ b/wagtail/wagtaildocs/migrations/0002_initial_data.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def add_document_permissions_to_admin_groups(apps, schema_editor): diff --git a/wagtail/wagtailembeds/embeds.py b/wagtail/wagtailembeds/embeds.py index 845da03e4..da13cb6c2 100644 --- a/wagtail/wagtailembeds/embeds.py +++ b/wagtail/wagtailembeds/embeds.py @@ -10,7 +10,6 @@ from six.moves.urllib.parse import urlencode from django.utils.module_loading import import_string from django.conf import settings -from django.utils import six from wagtail.wagtailembeds.oembed_providers import get_oembed_provider from wagtail.wagtailembeds.models import Embed diff --git a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py index 2aa4fdc49..40f42aeb0 100644 --- a/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py +++ b/wagtail/wagtailembeds/templatetags/wagtailembeds_tags.py @@ -1,5 +1,3 @@ -import warnings - from django import template from django.utils.safestring import mark_safe diff --git a/wagtail/wagtailembeds/tests.py b/wagtail/wagtailembeds/tests.py index b0799da38..21371a195 100644 --- a/wagtail/wagtailembeds/tests.py +++ b/wagtail/wagtailembeds/tests.py @@ -8,7 +8,7 @@ from bs4 import BeautifulSoup from wagtail.wagtailembeds.rich_text import MediaEmbedHandler try: - import embedly + import embedly # noqa no_embedly = False except ImportError: no_embedly = True diff --git a/wagtail/wagtailimages/migrations/0002_initial_data.py b/wagtail/wagtailimages/migrations/0002_initial_data.py index 7451ba7d7..6ba57754e 100644 --- a/wagtail/wagtailimages/migrations/0002_initial_data.py +++ b/wagtail/wagtailimages/migrations/0002_initial_data.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations def add_image_permissions_to_admin_groups(apps, schema_editor): diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 09ec680e0..65814b258 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import os.path import hashlib -import re from contextlib import contextmanager import warnings diff --git a/wagtail/wagtailimages/tests/test_models.py b/wagtail/wagtailimages/tests/test_models.py index 5d96a2848..726414c50 100644 --- a/wagtail/wagtailimages/tests/test_models.py +++ b/wagtail/wagtailimages/tests/test_models.py @@ -9,12 +9,11 @@ from django.contrib.auth.models import Group, Permission from django.core.files.uploadedfile import SimpleUploadedFile from django.db.utils import IntegrityError -from django.db import connection from wagtail.tests.utils import WagtailTestUtils from wagtail.wagtailcore.models import Page from wagtail.tests.testapp.models import EventPage, EventPageCarouselItem -from wagtail.wagtailimages.models import Rendition, Filter, SourceImageIOError +from wagtail.wagtailimages.models import Rendition, SourceImageIOError from wagtail.wagtailimages.rect import Rect from .utils import Image, get_test_image_file diff --git a/wagtail/wagtailimages/tests/tests.py b/wagtail/wagtailimages/tests/tests.py index f6d96194c..66365f36a 100644 --- a/wagtail/wagtailimages/tests/tests.py +++ b/wagtail/wagtailimages/tests/tests.py @@ -1,6 +1,4 @@ -import datetime import warnings -from contextlib import contextmanager from mock import MagicMock @@ -8,7 +6,6 @@ from django.test import TestCase from django import template, forms from django.utils import six from django.core.urlresolvers import reverse -from django.db import models from taggit.forms import TagField, TagWidget diff --git a/wagtail/wagtailimages/views/frontend.py b/wagtail/wagtailimages/views/frontend.py index a68803094..7e78473df 100644 --- a/wagtail/wagtailimages/views/frontend.py +++ b/wagtail/wagtailimages/views/frontend.py @@ -5,7 +5,7 @@ from django.shortcuts import get_object_or_404 from django.http import HttpResponse from django.core.exceptions import PermissionDenied -from wagtail.wagtailimages.models import get_image_model, Filter +from wagtail.wagtailimages.models import get_image_model from wagtail.wagtailimages.utils import verify_signature from wagtail.wagtailimages.exceptions import InvalidFilterSpecError diff --git a/wagtail/wagtailimages/views/multiple.py b/wagtail/wagtailimages/views/multiple.py index 6907c8629..3a2e69cd9 100644 --- a/wagtail/wagtailimages/views/multiple.py +++ b/wagtail/wagtailimages/views/multiple.py @@ -3,12 +3,11 @@ import json from django.shortcuts import render, get_object_or_404 from django.contrib.auth.decorators import permission_required from django.views.decorators.http import require_POST -from django.core.exceptions import PermissionDenied, ValidationError +from django.core.exceptions import PermissionDenied from django.views.decorators.vary import vary_on_headers from django.http import HttpResponse, HttpResponseBadRequest from django.template import RequestContext from django.template.loader import render_to_string -from django.utils.translation import ugettext as _ from django.utils.encoding import force_text from wagtail.wagtailsearch.backends import get_search_backends @@ -20,7 +19,6 @@ from wagtail.wagtailimages.fields import ( IMAGE_FIELD_HELP_TEXT, INVALID_IMAGE_ERROR, ALLOWED_EXTENSIONS, - SUPPORTED_FORMATS_TEXT, FILE_TOO_LARGE_ERROR, ) diff --git a/wagtail/wagtailsearch/backends/base.py b/wagtail/wagtailsearch/backends/base.py index c63d9bf9d..2c51f54a1 100644 --- a/wagtail/wagtailsearch/backends/base.py +++ b/wagtail/wagtailsearch/backends/base.py @@ -1,10 +1,8 @@ from six import text_type -from django.db import models from django.db.models.query import QuerySet from django.db.models.lookups import Lookup from django.db.models.sql.where import SubqueryConstraint, WhereNode -from django.core.exceptions import ImproperlyConfigured from wagtail.wagtailsearch.index import class_is_indexed diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index 21d5e71d3..ff9d8525c 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -4,13 +4,11 @@ import json from six.moves.urllib.parse import urlparse -from django.db import models - -from elasticsearch import Elasticsearch, NotFoundError, RequestError +from elasticsearch import Elasticsearch, NotFoundError from elasticsearch.helpers import bulk from wagtail.wagtailsearch.backends.base import BaseSearch, BaseSearchQuery, BaseSearchResults -from wagtail.wagtailsearch.index import Indexed, SearchField, FilterField, class_is_indexed +from wagtail.wagtailsearch.index import SearchField, FilterField, class_is_indexed class ElasticSearchMapping(object): diff --git a/wagtail/wagtailsearch/index.py b/wagtail/wagtailsearch/index.py index 0ff46f955..9d66cf9f8 100644 --- a/wagtail/wagtailsearch/index.py +++ b/wagtail/wagtailsearch/index.py @@ -1,7 +1,3 @@ -import warnings - -from six import string_types - from django.db import models from django.apps import apps diff --git a/wagtail/wagtailsearch/management/commands/update_index.py b/wagtail/wagtailsearch/management/commands/update_index.py index 149a49f35..c6c092906 100644 --- a/wagtail/wagtailsearch/management/commands/update_index.py +++ b/wagtail/wagtailsearch/management/commands/update_index.py @@ -3,7 +3,7 @@ from optparse import make_option from django.core.management.base import BaseCommand from django.conf import settings -from wagtail.wagtailsearch.index import Indexed, get_indexed_models +from wagtail.wagtailsearch.index import get_indexed_models from wagtail.wagtailsearch.backends import get_search_backend diff --git a/wagtail/wagtailsearch/signal_handlers.py b/wagtail/wagtailsearch/signal_handlers.py index f471c1871..6f701af31 100644 --- a/wagtail/wagtailsearch/signal_handlers.py +++ b/wagtail/wagtailsearch/signal_handlers.py @@ -1,6 +1,6 @@ from django.db.models.signals import post_save, post_delete -from wagtail.wagtailsearch.index import Indexed, get_indexed_models +from wagtail.wagtailsearch.index import get_indexed_models from wagtail.wagtailsearch.backends import get_search_backends diff --git a/wagtail/wagtailsearch/tests/test_backends.py b/wagtail/wagtailsearch/tests/test_backends.py index fc181d6f3..702cc8290 100644 --- a/wagtail/wagtailsearch/tests/test_backends.py +++ b/wagtail/wagtailsearch/tests/test_backends.py @@ -1,5 +1,4 @@ from six import StringIO -import warnings import unittest from django.test import TestCase diff --git a/wagtail/wagtailsearch/tests/test_indexed_class.py b/wagtail/wagtailsearch/tests/test_indexed_class.py index 91cc2b51a..97cd5549a 100644 --- a/wagtail/wagtailsearch/tests/test_indexed_class.py +++ b/wagtail/wagtailsearch/tests/test_indexed_class.py @@ -1,10 +1,7 @@ -import warnings - from django.test import TestCase from wagtail.wagtailsearch import index from wagtail.tests.search import models -from wagtail.tests.utils import WagtailTestUtils class TestContentTypeNames(TestCase): diff --git a/wagtail/wagtailsearch/urls/__init__.py b/wagtail/wagtailsearch/urls/__init__.py index faba126e7..1924c5228 100644 --- a/wagtail/wagtailsearch/urls/__init__.py +++ b/wagtail/wagtailsearch/urls/__init__.py @@ -1 +1 @@ -from wagtail.wagtailsearch.urls.frontend import urlpatterns +from wagtail.wagtailsearch.urls.frontend import urlpatterns # noqa diff --git a/wagtail/wagtailsearch/views/__init__.py b/wagtail/wagtailsearch/views/__init__.py index 7f39327bd..f98e0899a 100644 --- a/wagtail/wagtailsearch/views/__init__.py +++ b/wagtail/wagtailsearch/views/__init__.py @@ -1 +1 @@ -from wagtail.wagtailsearch.views.frontend import search \ No newline at end of file +from wagtail.wagtailsearch.views.frontend import search # noqa diff --git a/wagtail/wagtailsnippets/tests.py b/wagtail/wagtailsnippets/tests.py index 996853dad..8bdf84050 100644 --- a/wagtail/wagtailsnippets/tests.py +++ b/wagtail/wagtailsnippets/tests.py @@ -1,7 +1,5 @@ -from django.http import Http404 from django.test import TestCase from django.core.urlresolvers import reverse -from django.db import models from django.test.utils import override_settings from wagtail.tests.utils import WagtailTestUtils