From 193f624e1b195d5bd34f0440c7eb49c732e36673 Mon Sep 17 00:00:00 2001 From: Tatiana Mazur Date: Tue, 28 Jan 2014 15:36:08 +0400 Subject: [PATCH] Remove leftovers of "# noqa" This patch set removes leftovers of "# noqa" from imports added to import_exceptions. It also adds "django.test.utils.override_settings" to import_exceptions, so a few more "# noqa" tags become unnecessary. Closes-Bug: #1273647 Change-Id: I39f856ac3ea371a2fcab272bbf358d0243164b6d --- horizon/conf/__init__.py | 2 +- horizon/messages.py | 2 +- horizon/tables/views.py | 2 +- horizon/tabs/base.py | 4 ++-- horizon/utils/filters.py | 2 +- openstack_dashboard/api/fwaas.py | 2 +- openstack_dashboard/dashboards/admin/flavors/extras/views.py | 2 +- openstack_dashboard/dashboards/admin/images/tests.py | 2 +- openstack_dashboard/dashboards/admin/projects/tests.py | 2 +- .../project/access_and_security/api_access/views.py | 2 +- .../project/access_and_security/floating_ips/tests.py | 2 +- .../dashboards/project/images_and_snapshots/images/tests.py | 2 +- openstack_dashboard/dashboards/project/instances/tables.py | 2 +- openstack_dashboard/dashboards/project/overview/tests.py | 2 +- openstack_dashboard/dashboards/project/stacks/sro.py | 2 +- openstack_dashboard/dashboards/project/vpn/forms.py | 4 ++-- openstack_dashboard/dashboards/project/vpn/tables.py | 2 +- openstack_dashboard/test/api_tests/glance_tests.py | 2 +- openstack_dashboard/test/api_tests/nova_tests.py | 2 +- tox.ini | 1 + 20 files changed, 22 insertions(+), 21 deletions(-) diff --git a/horizon/conf/__init__.py b/horizon/conf/__init__.py index b9043df457..73a3af5c4e 100644 --- a/horizon/conf/__init__.py +++ b/horizon/conf/__init__.py @@ -18,7 +18,7 @@ from django.utils.functional import LazyObject # noqa class LazySettings(LazyObject): def _setup(self, name=None): - from django.conf import settings # noqa + from django.conf import settings from horizon.conf.default import HORIZON_CONFIG as DEFAULT_CONFIG # noqa HORIZON_CONFIG = copy.copy(DEFAULT_CONFIG) HORIZON_CONFIG.update(settings.HORIZON_CONFIG) diff --git a/horizon/messages.py b/horizon/messages.py index 57473b14e9..c518ef7564 100644 --- a/horizon/messages.py +++ b/horizon/messages.py @@ -21,7 +21,7 @@ messaging needs (e.g. AJAX communication, etc.). from django.contrib import messages as _messages from django.contrib.messages import constants -from django.utils.encoding import force_unicode # noqa +from django.utils.encoding import force_unicode from django.utils.safestring import SafeData # noqa diff --git a/horizon/tables/views.py b/horizon/tables/views.py index bb85bbeeb6..e4d870ed1c 100644 --- a/horizon/tables/views.py +++ b/horizon/tables/views.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from collections import defaultdict # noqa +from collections import defaultdict from django.views import generic diff --git a/horizon/tabs/base.py b/horizon/tabs/base.py index 6dc25fc2d1..f6e7bd13a6 100644 --- a/horizon/tabs/base.py +++ b/horizon/tabs/base.py @@ -16,9 +16,9 @@ import sys -from django.template.loader import render_to_string # noqa +from django.template.loader import render_to_string from django.template import TemplateSyntaxError # noqa -from django.utils.datastructures import SortedDict # noqa +from django.utils.datastructures import SortedDict from horizon import exceptions from horizon.utils import html diff --git a/horizon/utils/filters.py b/horizon/utils/filters.py index 75dd429e50..5b183b7793 100644 --- a/horizon/utils/filters.py +++ b/horizon/utils/filters.py @@ -18,7 +18,7 @@ import iso8601 from django.template.defaultfilters import register # noqa from django.template.defaultfilters import timesince # noqa -from django.utils.safestring import mark_safe # noqa +from django.utils.safestring import mark_safe from django.utils import timezone diff --git a/openstack_dashboard/api/fwaas.py b/openstack_dashboard/api/fwaas.py index b557ef4ce6..d2e661df87 100644 --- a/openstack_dashboard/api/fwaas.py +++ b/openstack_dashboard/api/fwaas.py @@ -16,7 +16,7 @@ from __future__ import absolute_import -from django.utils.datastructures import SortedDict # noqa +from django.utils.datastructures import SortedDict from openstack_dashboard.api import neutron diff --git a/openstack_dashboard/dashboards/admin/flavors/extras/views.py b/openstack_dashboard/dashboards/admin/flavors/extras/views.py index c2c41e7251..b77d583078 100644 --- a/openstack_dashboard/dashboards/admin/flavors/extras/views.py +++ b/openstack_dashboard/dashboards/admin/flavors/extras/views.py @@ -19,7 +19,7 @@ # under the License. -from django.core.urlresolvers import reverse # noqa +from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ from horizon import exceptions diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py index 9aef08dea6..b0436b449d 100644 --- a/openstack_dashboard/dashboards/admin/images/tests.py +++ b/openstack_dashboard/dashboards/admin/images/tests.py @@ -17,7 +17,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from mox import IsA # noqa diff --git a/openstack_dashboard/dashboards/admin/projects/tests.py b/openstack_dashboard/dashboards/admin/projects/tests.py index 75af130710..0c06d0c4ce 100644 --- a/openstack_dashboard/dashboards/admin/projects/tests.py +++ b/openstack_dashboard/dashboards/admin/projects/tests.py @@ -21,7 +21,7 @@ import os from django.core.urlresolvers import reverse from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from django.utils import timezone from django.utils import unittest diff --git a/openstack_dashboard/dashboards/project/access_and_security/api_access/views.py b/openstack_dashboard/dashboards/project/access_and_security/api_access/views.py index 75f5b3ec2c..e8f34795c9 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/api_access/views.py +++ b/openstack_dashboard/dashboards/project/access_and_security/api_access/views.py @@ -21,7 +21,7 @@ import zipfile from django import http from django import shortcuts -from django.template.loader import render_to_string # noqa +from django.template.loader import render_to_string from django.utils.translation import ugettext_lazy as _ from horizon import exceptions diff --git a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py index 1477de8d42..5044fd1343 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py +++ b/openstack_dashboard/dashboards/project/access_and_security/floating_ips/tests.py @@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from mox import IsA # noqa diff --git a/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py b/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py index c434587126..b7ec37b243 100644 --- a/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py +++ b/openstack_dashboard/dashboards/project/images_and_snapshots/images/tests.py @@ -25,7 +25,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile # noqa from django.core.urlresolvers import reverse from django.forms.widgets import HiddenInput # noqa from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from mox import IsA # noqa diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py index 3c89ce50cb..b0127a7a81 100644 --- a/openstack_dashboard/dashboards/project/instances/tables.py +++ b/openstack_dashboard/dashboards/project/instances/tables.py @@ -17,7 +17,7 @@ import logging -from django.conf import settings # noqa +from django.conf import settings from django.core import urlresolvers from django import shortcuts from django import template diff --git a/openstack_dashboard/dashboards/project/overview/tests.py b/openstack_dashboard/dashboards/project/overview/tests.py index 2007feb64c..4b539fe81c 100644 --- a/openstack_dashboard/dashboards/project/overview/tests.py +++ b/openstack_dashboard/dashboards/project/overview/tests.py @@ -22,7 +22,7 @@ import datetime from django.core.urlresolvers import reverse from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from django.utils import timezone from mox import IsA # noqa diff --git a/openstack_dashboard/dashboards/project/stacks/sro.py b/openstack_dashboard/dashboards/project/stacks/sro.py index cc1c4c937a..a43685feb7 100644 --- a/openstack_dashboard/dashboards/project/stacks/sro.py +++ b/openstack_dashboard/dashboards/project/stacks/sro.py @@ -11,7 +11,7 @@ # under the License. from django.template.defaultfilters import title # noqa -from django.template.loader import render_to_string # noqa +from django.template.loader import render_to_string from horizon.utils import filters diff --git a/openstack_dashboard/dashboards/project/vpn/forms.py b/openstack_dashboard/dashboards/project/vpn/forms.py index 25095db334..561f3b9d79 100644 --- a/openstack_dashboard/dashboards/project/vpn/forms.py +++ b/openstack_dashboard/dashboards/project/vpn/forms.py @@ -18,8 +18,8 @@ import logging -from django.core.urlresolvers import reverse # noqa -from django.utils.translation import ugettext_lazy as _ # noqa +from django.core.urlresolvers import reverse +from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms diff --git a/openstack_dashboard/dashboards/project/vpn/tables.py b/openstack_dashboard/dashboards/project/vpn/tables.py index 4b64d840fb..9b23553bc9 100644 --- a/openstack_dashboard/dashboards/project/vpn/tables.py +++ b/openstack_dashboard/dashboards/project/vpn/tables.py @@ -17,7 +17,7 @@ # @author: Tatiana Mazur -from django.core.urlresolvers import reverse # noqa +from django.core.urlresolvers import reverse from django.template.defaultfilters import title # noqa from django.utils.translation import ugettext_lazy as _ diff --git a/openstack_dashboard/test/api_tests/glance_tests.py b/openstack_dashboard/test/api_tests/glance_tests.py index 38d79d4e00..d9c0e5edb3 100644 --- a/openstack_dashboard/test/api_tests/glance_tests.py +++ b/openstack_dashboard/test/api_tests/glance_tests.py @@ -19,7 +19,7 @@ # under the License. from django.conf import settings -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from openstack_dashboard import api from openstack_dashboard.test import helpers as test diff --git a/openstack_dashboard/test/api_tests/nova_tests.py b/openstack_dashboard/test/api_tests/nova_tests.py index 569121e831..203f263716 100644 --- a/openstack_dashboard/test/api_tests/nova_tests.py +++ b/openstack_dashboard/test/api_tests/nova_tests.py @@ -23,7 +23,7 @@ from __future__ import absolute_import from django.conf import settings from django import http -from django.test.utils import override_settings # noqa +from django.test.utils import override_settings from mox import IsA # noqa from novaclient.v1_1 import servers diff --git a/tox.ini b/tox.ini index 561133bf7e..5e84941511 100644 --- a/tox.ini +++ b/tox.ini @@ -49,6 +49,7 @@ import_exceptions = collections.defaultdict, django.core.urlresolvers.reverse, django.core.urlresolvers.reverse_lazy, django.template.loader.render_to_string, + django.test.utils.override_settings, django.utils.datastructures.SortedDict, django.utils.encoding.force_unicode, django.utils.html.conditional_escape,