From 290769f087281c3c3f3a6a831e653b39e07107e3 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Wed, 20 Aug 2014 18:54:10 +0200
Subject: [PATCH] Flake8: Fix F401

Fix:
F401 'XXX' imported but unused
Add noqa where needed, remove extra imports otherwise.

Remove F401 from ignore list.

Partial-Bug: #1333290
Change-Id: Ib71f0dd001c4e4899200b5e60b3a38e4a6c40555
---
 bin/manila-all                                              | 2 +-
 bin/manila-api                                              | 2 +-
 bin/manila-manage                                           | 4 ++--
 bin/manila-scheduler                                        | 2 +-
 bin/manila-share                                            | 2 +-
 contrib/tempest/tempest/cli/simple_read_only/test_manila.py | 1 -
 manila/api/contrib/admin_actions.py                         | 1 -
 manila/api/v1/share_networks.py                             | 2 --
 manila/api/v1/shares.py                                     | 1 -
 manila/api/views/share_snapshots.py                         | 1 -
 manila/api/views/shares.py                                  | 1 -
 manila/share/drivers/glusterfs.py                           | 2 --
 manila/test.py                                              | 1 -
 manila/tests/api/contrib/test_share_actions.py              | 6 ------
 manila/tests/api/contrib/test_types_extra_specs.py          | 1 -
 manila/tests/api/v1/test_share_metadata.py                  | 1 -
 manila/tests/api/v1/test_share_networks.py                  | 1 -
 manila/tests/api/v1/test_share_snapshots.py                 | 1 -
 manila/tests/network/test_share_network_db.py               | 1 -
 manila/tests/scheduler/test_capacity_weigher.py             | 1 -
 manila/tests/scheduler/test_host_filters.py                 | 5 -----
 manila/tests/test_conf.py                                   | 2 +-
 manila/tests/test_exception.py                              | 1 -
 manila/tests/test_share.py                                  | 1 -
 manila/tests/test_share_api.py                              | 4 ----
 manila/tests/test_wsgi.py                                   | 1 -
 manila/tests/windows/windowsutils.py                        | 1 -
 tox.ini                                                     | 2 +-
 28 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/bin/manila-all b/bin/manila-all
index 016701d762..729fe01fc6 100755
--- a/bin/manila-all
+++ b/bin/manila-all
@@ -42,7 +42,7 @@ if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")):
 
 from manila.openstack.common import gettextutils
 gettextutils.install('manila')
-from manila.common import config  # Need to register global_opts
+from manila.common import config  # Need to register global_opts  # noqa
 from manila.openstack.common import log as logging
 from manila import service
 from manila import utils
diff --git a/bin/manila-api b/bin/manila-api
index dc212ce7a2..41f3fd825f 100755
--- a/bin/manila-api
+++ b/bin/manila-api
@@ -39,7 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, "manila", "__init__.py")):
 
 from manila.openstack.common import gettextutils
 gettextutils.install('manila')
-from manila.common import config  # Need to register global_opts
+from manila.common import config  # Need to register global_opts  # noqa
 from manila.openstack.common import log as logging
 from manila import service
 from manila import utils
diff --git a/bin/manila-manage b/bin/manila-manage
index 0f5e36c0c1..fb62e9554e 100755
--- a/bin/manila-manage
+++ b/bin/manila-manage
@@ -73,7 +73,7 @@ gettextutils.install('manila')
 
 from oslo.config import cfg
 
-from manila.common import config  # Need to register global_opts
+from manila.common import config  # Need to register global_opts  # noqa
 from manila import context
 from manila import db
 from manila.db import migration
@@ -162,7 +162,7 @@ class ShellCommands(object):
             else:
                 # We don't have to wrap the following import in a 'try',
                 # because we already know 'readline' was imported successfully.
-                import rlcompleter
+                import rlcompleter  # noqa
                 readline.parse_and_bind("tab:complete")
             code.interact()
 
diff --git a/bin/manila-scheduler b/bin/manila-scheduler
index 2bc59d6ac8..8e155775b1 100755
--- a/bin/manila-scheduler
+++ b/bin/manila-scheduler
@@ -37,7 +37,7 @@ if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')):
 
 from manila.openstack.common import gettextutils
 gettextutils.install('manila')
-from manila.common import config  # Need to register global_opts
+from manila.common import config  # Need to register global_opts  # noqa
 from manila.openstack.common import log as logging
 from manila import service
 from manila import utils
diff --git a/bin/manila-share b/bin/manila-share
index 1f06da074d..5f27161310 100755
--- a/bin/manila-share
+++ b/bin/manila-share
@@ -36,7 +36,7 @@ if os.path.exists(os.path.join(possible_topdir, 'manila', '__init__.py')):
 
 from manila.openstack.common import gettextutils
 gettextutils.install('manila')
-from manila.common import config  # Need to register global_opts
+from manila.common import config  # Need to register global_opts  # noqa
 from manila.openstack.common import log as logging
 from manila import service
 from manila import utils
diff --git a/contrib/tempest/tempest/cli/simple_read_only/test_manila.py b/contrib/tempest/tempest/cli/simple_read_only/test_manila.py
index 1be1b6a00b..ae2c5ae21f 100644
--- a/contrib/tempest/tempest/cli/simple_read_only/test_manila.py
+++ b/contrib/tempest/tempest/cli/simple_read_only/test_manila.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import re
-import subprocess
 
 from tempest.cli import manilaclient
 from tempest import config_share as config
diff --git a/manila/api/contrib/admin_actions.py b/manila/api/contrib/admin_actions.py
index 852e736ff3..07442e66ab 100644
--- a/manila/api/contrib/admin_actions.py
+++ b/manila/api/contrib/admin_actions.py
@@ -20,7 +20,6 @@ from manila.api.openstack import wsgi
 from manila import db
 from manila import exception
 from manila.openstack.common import log as logging
-from manila.openstack.common import strutils
 from manila import share
 
 
diff --git a/manila/api/v1/share_networks.py b/manila/api/v1/share_networks.py
index cce603bedf..a0db4aea42 100644
--- a/manila/api/v1/share_networks.py
+++ b/manila/api/v1/share_networks.py
@@ -23,10 +23,8 @@ from webob import exc
 from manila.api.openstack import wsgi
 from manila.api.views import share_networks as share_networks_views
 from manila.api import xmlutil
-from manila.common import constants
 from manila.db import api as db_api
 from manila import exception
-from manila.openstack.common import importutils
 from manila.openstack.common import log as logging
 from manila import policy
 from manila import quota
diff --git a/manila/api/v1/shares.py b/manila/api/v1/shares.py
index 4e83fd73e0..ee8f20ee8d 100644
--- a/manila/api/v1/shares.py
+++ b/manila/api/v1/shares.py
@@ -23,7 +23,6 @@ from manila.api import common
 from manila.api.openstack import wsgi
 from manila.api.views import shares as share_views
 from manila.api import xmlutil
-from manila.common import constants
 from manila import exception
 from manila.openstack.common import log as logging
 from manila.openstack.common import uuidutils
diff --git a/manila/api/views/share_snapshots.py b/manila/api/views/share_snapshots.py
index cc5b074c3e..f95eec22b9 100644
--- a/manila/api/views/share_snapshots.py
+++ b/manila/api/views/share_snapshots.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from manila.api import common
-from manila.openstack.common import log as logging
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/manila/api/views/shares.py b/manila/api/views/shares.py
index 810915deb0..ab80f77f35 100644
--- a/manila/api/views/shares.py
+++ b/manila/api/views/shares.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from manila.api import common
-from manila.openstack.common import log as logging
 
 
 class ViewBuilder(common.ViewBuilder):
diff --git a/manila/share/drivers/glusterfs.py b/manila/share/drivers/glusterfs.py
index b9f040ab65..cf19ce13fb 100644
--- a/manila/share/drivers/glusterfs.py
+++ b/manila/share/drivers/glusterfs.py
@@ -27,7 +27,6 @@ TODO(rraja): support SMB protocol.
 
 import errno
 import os
-import pdb
 from pipes import quote as shellquote
 import re
 import xml.etree.cElementTree as etree
@@ -35,7 +34,6 @@ import xml.etree.cElementTree as etree
 from manila import exception
 from manila.openstack.common import log as logging
 from manila.share import driver
-from manila import utils
 
 from oslo.config import cfg
 
diff --git a/manila/test.py b/manila/test.py
index 40bb1b76b2..9282428340 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -38,7 +38,6 @@ from manila.openstack.common import log as logging
 from manila.openstack.common import timeutils
 from manila import rpc
 from manila import service
-from manila import tests
 from manila.tests import conf_fixture
 from manila.tests import fake_notifier
 
diff --git a/manila/tests/api/contrib/test_share_actions.py b/manila/tests/api/contrib/test_share_actions.py
index 839f786238..6702331ad6 100644
--- a/manila/tests/api/contrib/test_share_actions.py
+++ b/manila/tests/api/contrib/test_share_actions.py
@@ -12,16 +12,10 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import datetime
-import uuid
-
 from oslo.config import cfg
 import webob
 
 from manila.api.contrib import share_actions
-from manila import exception
-from manila.openstack.common import jsonutils
-from manila import share
 from manila.share import api as share_api
 from manila import test
 from manila.tests.api.contrib import stubs
diff --git a/manila/tests/api/contrib/test_types_extra_specs.py b/manila/tests/api/contrib/test_types_extra_specs.py
index 5f4ed88a6d..ea5591b3c6 100644
--- a/manila/tests/api/contrib/test_types_extra_specs.py
+++ b/manila/tests/api/contrib/test_types_extra_specs.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from lxml import etree
 import mock
 import webob
 
diff --git a/manila/tests/api/v1/test_share_metadata.py b/manila/tests/api/v1/test_share_metadata.py
index 157796c7f3..28697a2207 100644
--- a/manila/tests/api/v1/test_share_metadata.py
+++ b/manila/tests/api/v1/test_share_metadata.py
@@ -20,7 +20,6 @@ import uuid
 from oslo.config import cfg
 import webob
 
-from manila.api import extensions
 from manila.api.v1 import share_metadata
 from manila.api.v1 import shares
 import manila.db
diff --git a/manila/tests/api/v1/test_share_networks.py b/manila/tests/api/v1/test_share_networks.py
index 604a01e884..14b673e1b3 100644
--- a/manila/tests/api/v1/test_share_networks.py
+++ b/manila/tests/api/v1/test_share_networks.py
@@ -21,7 +21,6 @@ from manila.api.v1 import share_networks
 from manila.common import constants
 from manila.db import api as db_api
 from manila import exception
-from manila import policy
 from manila import quota
 from manila import test
 from manila.tests.api import fakes
diff --git a/manila/tests/api/v1/test_share_snapshots.py b/manila/tests/api/v1/test_share_snapshots.py
index d61a77b941..be281a2361 100644
--- a/manila/tests/api/v1/test_share_snapshots.py
+++ b/manila/tests/api/v1/test_share_snapshots.py
@@ -18,7 +18,6 @@ import datetime
 import webob
 
 from manila.api.v1 import share_snapshots
-from manila import exception
 from manila.share import api as share_api
 from manila import test
 from manila.tests.api.contrib import stubs
diff --git a/manila/tests/network/test_share_network_db.py b/manila/tests/network/test_share_network_db.py
index 23a07e018e..009e222110 100644
--- a/manila/tests/network/test_share_network_db.py
+++ b/manila/tests/network/test_share_network_db.py
@@ -16,7 +16,6 @@
 from oslo.db import exception as db_exception
 import six
 
-from manila.common import constants
 from manila import context
 from manila.db import api as db_api
 from manila.db.sqlalchemy import api as sqlalchemy_api
diff --git a/manila/tests/scheduler/test_capacity_weigher.py b/manila/tests/scheduler/test_capacity_weigher.py
index 2947c283de..dc3ea1e4a0 100644
--- a/manila/tests/scheduler/test_capacity_weigher.py
+++ b/manila/tests/scheduler/test_capacity_weigher.py
@@ -18,7 +18,6 @@ Tests For Capacity Weigher.
 
 import mock
 from oslo.config import cfg
-import testtools
 
 from manila import context
 from manila.openstack.common.scheduler.weights import HostWeightHandler
diff --git a/manila/tests/scheduler/test_host_filters.py b/manila/tests/scheduler/test_host_filters.py
index a504e8f3a8..f8ff68f4b0 100644
--- a/manila/tests/scheduler/test_host_filters.py
+++ b/manila/tests/scheduler/test_host_filters.py
@@ -15,16 +15,11 @@
 Tests For Scheduler Host Filters.
 """
 
-import httplib
-
 from manila import context
-from manila import db
-from manila import exception
 from manila.openstack.common import jsonutils
 from manila.openstack.common.scheduler import filters
 from manila import test
 from manila.tests.scheduler import fakes
-from manila.tests import utils as test_utils
 from manila import utils
 
 
diff --git a/manila/tests/test_conf.py b/manila/tests/test_conf.py
index 0039ebc293..c928f3ddef 100644
--- a/manila/tests/test_conf.py
+++ b/manila/tests/test_conf.py
@@ -47,7 +47,7 @@ class ConfigTestCase(test.TestCase):
 
     def test_runtime_and_unknown_flags(self):
         self.assertNotIn('runtime_answer', CONF)
-        import manila.tests.runtime_conf
+        import manila.tests.runtime_conf  # noqa
         self.assertIn('runtime_answer', CONF)
         self.assertEqual(CONF.runtime_answer, 54)
 
diff --git a/manila/tests/test_exception.py b/manila/tests/test_exception.py
index 1c636e853b..47a5933642 100644
--- a/manila/tests/test_exception.py
+++ b/manila/tests/test_exception.py
@@ -19,7 +19,6 @@ import six
 
 from manila import exception
 from manila import test
-from manila import utils
 
 
 class FakeNotifier(object):
diff --git a/manila/tests/test_share.py b/manila/tests/test_share.py
index ee8e850f7a..4c4800a88d 100644
--- a/manila/tests/test_share.py
+++ b/manila/tests/test_share.py
@@ -25,7 +25,6 @@ from manila import context
 from manila import db
 from manila import exception
 from manila.openstack.common import importutils
-import manila.policy
 from manila.share import manager
 from manila import test
 from manila import utils
diff --git a/manila/tests/test_share_api.py b/manila/tests/test_share_api.py
index 907cf7cc23..6b12a01ffe 100644
--- a/manila/tests/test_share_api.py
+++ b/manila/tests/test_share_api.py
@@ -15,21 +15,17 @@
 """Unit tests for the Share API module."""
 
 import datetime
-import random
 import uuid
 
 import mock
-import suds
 
 from manila import context
 from manila import db as db_driver
 from manila import exception
 from manila.openstack.common import timeutils
 from manila import quota
-from manila.scheduler import rpcapi as scheduler_rpcapi
 from manila import share
 from manila.share import api as share_api
-from manila.share import rpcapi as share_rpcapi
 from manila import test
 from manila.tests.db import fakes as db_fakes
 from manila import utils
diff --git a/manila/tests/test_wsgi.py b/manila/tests/test_wsgi.py
index 92577da3d6..c7235b9b73 100644
--- a/manila/tests/test_wsgi.py
+++ b/manila/tests/test_wsgi.py
@@ -17,7 +17,6 @@
 """Unit tests for `manila.wsgi`."""
 
 import os.path
-import ssl
 import tempfile
 import urllib2
 
diff --git a/manila/tests/windows/windowsutils.py b/manila/tests/windows/windowsutils.py
index 6157da8c84..2038ae372b 100644
--- a/manila/tests/windows/windowsutils.py
+++ b/manila/tests/windows/windowsutils.py
@@ -19,7 +19,6 @@ Windows storage classes to be used in testing.
 """
 
 import os
-import sys
 
 from oslo.config import cfg
 
diff --git a/tox.ini b/tox.ini
index c5e0534d5c..6c6dc88fca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,6 +49,6 @@ commands = bash tools/lintstack.sh
 #
 # H904 wrap long lines in parentheses instead of a backslash
 # reason: removed in hacking (https://review.openstack.org/#/c/101701/)
-ignore = E126,E127,E128,H302,H404,H405,H501,H904,F401,F841
+ignore = E126,E127,E128,H302,H404,H405,H501,H904,F841
 builtins = _
 exclude = .venv,.tox,dist,doc,openstack,*egg