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

@@ -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)

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
 
 

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
 

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

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
 
 

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
 

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

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
 

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
 

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

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
 

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
 

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

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

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
 

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

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 _
 

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

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

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,