From 88bb1af1d5e1e4d80be1e8bb7e21072c9c3b85e4 Mon Sep 17 00:00:00 2001
From: Victor Sergeyev <vsergeyev@mirantis.com>
Date: Mon, 4 Nov 2013 17:12:24 +0200
Subject: [PATCH] Enable F40X checking

Clean up imports due to F401 and F403 checks.
F401  'module' imported but unused
F403  unable to detect undefined names with wildcard import

Change-Id: I487edb157de1a6babc7ad8a3fb65f195e476c490
---
 glance/api/v1/images.py                                   | 4 +---
 glance/api/v2/images.py                                   | 1 -
 glance/cmd/control.py                                     | 1 -
 glance/common/client.py                                   | 2 +-
 glance/common/config.py                                   | 1 -
 .../migrate_repo/versions/003_add_disk_format.py          | 4 ++--
 .../sqlalchemy/migrate_repo/versions/004_add_checksum.py  | 4 ++--
 .../migrate_repo/versions/005_size_big_integer.py         | 4 ++--
 .../sqlalchemy/migrate_repo/versions/006_key_to_name.py   | 4 ++--
 .../db/sqlalchemy/migrate_repo/versions/007_add_owner.py  | 4 ++--
 .../migrate_repo/versions/008_add_image_members_table.py  | 4 ++--
 .../migrate_repo/versions/009_add_mindisk_and_minram.py   | 4 ++--
 .../migrate_repo/versions/010_default_update_at.py        | 4 ++--
 .../versions/017_quote_encrypted_swift_credentials.py     | 4 ++--
 .../versions/029_location_meta_data_pickle_to_string.py   | 2 +-
 glance/image_cache/drivers/xattr.py                       | 1 -
 glance/registry/api/v2/__init__.py                        | 1 -
 glance/store/__init__.py                                  | 3 ---
 glance/store/base.py                                      | 1 -
 glance/store/rbd.py                                       | 1 -
 glance/tests/functional/db/test_registry.py               | 2 --
 glance/tests/functional/test_cache_middleware.py          | 8 ++++----
 glance/tests/functional/v1/test_copy_to_file.py           | 2 +-
 glance/tests/unit/api/test_common.py                      | 2 --
 glance/tests/unit/base.py                                 | 1 -
 glance/tests/unit/common/test_client.py                   | 1 -
 glance/tests/unit/common/test_wsgi.py                     | 4 ----
 glance/tests/unit/test_cache_middleware.py                | 1 -
 glance/tests/unit/test_db.py                              | 2 +-
 glance/tests/unit/test_image_cache.py                     | 6 +++---
 glance/tests/unit/v1/test_registry_client.py              | 2 --
 glance/tests/utils.py                                     | 1 -
 tools/install_venv.py                                     | 1 -
 tox.ini                                                   | 4 +---
 34 files changed, 31 insertions(+), 60 deletions(-)

diff --git a/glance/api/v1/images.py b/glance/api/v1/images.py
index 575cd58229..a18d0b75d0 100644
--- a/glance/api/v1/images.py
+++ b/glance/api/v1/images.py
@@ -27,9 +27,7 @@ from webob.exc import (HTTPNotFound,
                        HTTPConflict,
                        HTTPBadRequest,
                        HTTPForbidden,
-                       HTTPRequestEntityTooLarge,
-                       HTTPInternalServerError,
-                       HTTPServiceUnavailable)
+                       HTTPRequestEntityTooLarge)
 from webob import Response
 
 from glance.api import common
diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py
index 1c58b9d78d..966b805dd8 100644
--- a/glance/api/v2/images.py
+++ b/glance/api/v2/images.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import copy
 import json
 import re
 import urllib
diff --git a/glance/cmd/control.py b/glance/cmd/control.py
index 30bdf499f0..e8ed855978 100644
--- a/glance/cmd/control.py
+++ b/glance/cmd/control.py
@@ -24,7 +24,6 @@ from __future__ import print_function
 from __future__ import with_statement
 
 import argparse
-import errno
 import fcntl
 import os
 import resource
diff --git a/glance/common/client.py b/glance/common/client.py
index 010297821a..1335ecc18b 100644
--- a/glance/common/client.py
+++ b/glance/common/client.py
@@ -36,7 +36,7 @@ except ImportError:
     import ssl
 
 try:
-    import sendfile
+    import sendfile  # noqa
     SENDFILE_SUPPORTED = True
 except ImportError:
     SENDFILE_SUPPORTED = False
diff --git a/glance/common/config.py b/glance/common/config.py
index c4392ecfd1..b8e2a21bf4 100644
--- a/glance/common/config.py
+++ b/glance/common/config.py
@@ -24,7 +24,6 @@ import logging
 import logging.config
 import logging.handlers
 import os
-import sys
 
 from oslo.config import cfg
 from paste import deploy
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
index 4b9f4a6b41..0499514821 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/003_add_disk_format.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
index 8de1576d5e..e0612dec6c 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/004_add_checksum.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
index af26da10b1..d751b75b43 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/005_size_big_integer.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
index c538cd5463..4b5990303e 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/006_key_to_name.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
index ae1009d247..dcd8287597 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/007_add_owner.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, BigInteger, Integer, String,
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py b/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
index 84a905c09e..468b4d8a87 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/008_add_image_members_table.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, create_tables,
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py b/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
index cdacfa8532..559f5d5756 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/009_add_mindisk_and_minram.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import (
     Boolean, DateTime, Integer, String, Text, from_migration_import)
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
index 6faeb45276..1ae09a6e64 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/010_default_update_at.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate.changeset import *
-from sqlalchemy import *
+from migrate.changeset import *  # noqa
+from sqlalchemy import *  # noqa
 
 from glance.db.sqlalchemy.migrate_repo.schema import from_migration_import
 
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
index b61a681de7..a0041aa811 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/017_quote_encrypted_swift_credentials.py
@@ -28,7 +28,7 @@ migration performs the following steps for every entry in the images table:
 
 Fixes bug #1081043
 """
-import types
+import types  # noqa
 import urllib
 import urlparse
 
@@ -38,7 +38,7 @@ import sqlalchemy
 from glance.common import crypt
 from glance.common import exception
 import glance.openstack.common.log as logging
-import glance.store.swift
+import glance.store.swift  # noqa
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py b/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
index fa524d35c6..3ac85f89d8 100644
--- a/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
+++ b/glance/db/sqlalchemy/migrate_repo/versions/029_location_meta_data_pickle_to_string.py
@@ -19,7 +19,7 @@ import json
 import pickle
 
 import sqlalchemy
-from sqlalchemy import MetaData, Table, Column
+from sqlalchemy import MetaData, Table, Column  # noqa
 from glance.db.sqlalchemy import models
 
 
diff --git a/glance/image_cache/drivers/xattr.py b/glance/image_cache/drivers/xattr.py
index 28070e7af0..448403a6e2 100644
--- a/glance/image_cache/drivers/xattr.py
+++ b/glance/image_cache/drivers/xattr.py
@@ -55,7 +55,6 @@ $image_cache_dir/
 
 from __future__ import absolute_import
 from contextlib import contextmanager
-import datetime
 import errno
 import os
 import stat
diff --git a/glance/registry/api/v2/__init__.py b/glance/registry/api/v2/__init__.py
index 96bfcb9298..754ec5eca5 100644
--- a/glance/registry/api/v2/__init__.py
+++ b/glance/registry/api/v2/__init__.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 import routes
-from webob import exc
 
 from glance.common import wsgi
 from glance.registry.api.v2 import rpc
diff --git a/glance/store/__init__.py b/glance/store/__init__.py
index 085e29de66..35e9a6b28a 100644
--- a/glance/store/__init__.py
+++ b/glance/store/__init__.py
@@ -16,13 +16,10 @@
 #    under the License.
 
 import collections
-import os
 import sys
-import time
 
 from oslo.config import cfg
 
-from glance.common import crypt
 from glance.common import exception
 from glance.common import utils
 import glance.context
diff --git a/glance/store/base.py b/glance/store/base.py
index 723b5ffdd4..5df628c18a 100644
--- a/glance/store/base.py
+++ b/glance/store/base.py
@@ -19,7 +19,6 @@
 """Base class for all storage backends"""
 
 from glance.common import exception
-from glance.common import utils
 from glance.openstack.common import importutils
 import glance.openstack.common.log as logging
 from glance.openstack.common import strutils
diff --git a/glance/store/rbd.py b/glance/store/rbd.py
index c6fa0674f1..4734c5eaee 100644
--- a/glance/store/rbd.py
+++ b/glance/store/rbd.py
@@ -28,7 +28,6 @@ from oslo.config import cfg
 
 from glance.common import exception
 from glance.common import utils
-from glance.openstack.common import excutils
 import glance.openstack.common.log as logging
 from glance.openstack.common import units
 import glance.store
diff --git a/glance/tests/functional/db/test_registry.py b/glance/tests/functional/db/test_registry.py
index 8ada2f0c0a..bf75d2a7b1 100644
--- a/glance/tests/functional/db/test_registry.py
+++ b/glance/tests/functional/db/test_registry.py
@@ -15,8 +15,6 @@
 
 from glance.api import CONF
 import glance.db.registry.api
-from glance.db.sqlalchemy import api
-from glance.db.sqlalchemy import models as db_models
 import glance.tests.functional.db as db_tests
 from glance.tests import functional
 from glance.tests.functional.db import base
diff --git a/glance/tests/functional/test_cache_middleware.py b/glance/tests/functional/test_cache_middleware.py
index 56e9b22dc9..e612f4aca0 100644
--- a/glance/tests/functional/test_cache_middleware.py
+++ b/glance/tests/functional/test_cache_middleware.py
@@ -733,7 +733,7 @@ class TestImageCacheXattr(functional.FunctionalTest,
 
         if not getattr(self, 'inited', False):
             try:
-                import xattr
+                import xattr  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
@@ -779,7 +779,7 @@ class TestImageCacheManageXattr(functional.FunctionalTest,
 
         if not getattr(self, 'inited', False):
             try:
-                import xattr
+                import xattr  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
@@ -825,7 +825,7 @@ class TestImageCacheSqlite(functional.FunctionalTest,
 
         if not getattr(self, 'inited', False):
             try:
-                import sqlite3
+                import sqlite3  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
@@ -864,7 +864,7 @@ class TestImageCacheManageSqlite(functional.FunctionalTest,
 
         if not getattr(self, 'inited', False):
             try:
-                import sqlite3
+                import sqlite3  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
diff --git a/glance/tests/functional/v1/test_copy_to_file.py b/glance/tests/functional/v1/test_copy_to_file.py
index b0a6862ceb..f9e11bd7d3 100644
--- a/glance/tests/functional/v1/test_copy_to_file.py
+++ b/glance/tests/functional/v1/test_copy_to_file.py
@@ -31,7 +31,7 @@ from glance.openstack.common import units
 from glance.tests import functional
 from glance.tests.functional.store_utils import (setup_http,
                                                  get_http_uri)
-from glance.tests.utils import skip_if_disabled, requires
+from glance.tests.utils import skip_if_disabled
 
 FIVE_KB = 5 * units.Ki
 
diff --git a/glance/tests/unit/api/test_common.py b/glance/tests/unit/api/test_common.py
index 4ee8a9a9df..2c4b049d54 100644
--- a/glance/tests/unit/api/test_common.py
+++ b/glance/tests/unit/api/test_common.py
@@ -20,9 +20,7 @@ import webob
 import glance.api.common
 from glance.common import config
 from glance.common import exception
-from glance.common import wsgi
 from glance.tests import utils as test_utils
-from glance.tests.unit import base
 
 
 class SimpleIterator(object):
diff --git a/glance/tests/unit/base.py b/glance/tests/unit/base.py
index 4a19730e1e..8069d3621e 100644
--- a/glance/tests/unit/base.py
+++ b/glance/tests/unit/base.py
@@ -21,7 +21,6 @@ import shutil
 
 import fixtures
 from oslo.config import cfg
-import stubout
 
 from glance import store
 from glance.store import location
diff --git a/glance/tests/unit/common/test_client.py b/glance/tests/unit/common/test_client.py
index ea9131bb20..79c474bd82 100644
--- a/glance/tests/unit/common/test_client.py
+++ b/glance/tests/unit/common/test_client.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 import httplib
-import StringIO
 
 import mox
 import testtools
diff --git a/glance/tests/unit/common/test_wsgi.py b/glance/tests/unit/common/test_wsgi.py
index a411f5ab75..887a530a26 100644
--- a/glance/tests/unit/common/test_wsgi.py
+++ b/glance/tests/unit/common/test_wsgi.py
@@ -15,12 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import socket
-import time
-
 import datetime
 import eventlet.patcher
-import httplib2
 import webob
 
 from glance.common import exception
diff --git a/glance/tests/unit/test_cache_middleware.py b/glance/tests/unit/test_cache_middleware.py
index fb2b255eeb..db568ab739 100644
--- a/glance/tests/unit/test_cache_middleware.py
+++ b/glance/tests/unit/test_cache_middleware.py
@@ -13,7 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
 import testtools
 import webob
 
diff --git a/glance/tests/unit/test_db.py b/glance/tests/unit/test_db.py
index 42284e0917..5adbc2ceb9 100644
--- a/glance/tests/unit/test_db.py
+++ b/glance/tests/unit/test_db.py
@@ -20,7 +20,7 @@ from glance.common import crypt
 from glance.common import exception
 import glance.context
 import glance.db
-from glance.openstack.common import uuidutils, timeutils
+from glance.openstack.common import uuidutils
 import glance.tests.unit.utils as unit_test_utils
 import glance.tests.utils as test_utils
 
diff --git a/glance/tests/unit/test_image_cache.py b/glance/tests/unit/test_image_cache.py
index d80cff8b73..412d2a861a 100644
--- a/glance/tests/unit/test_image_cache.py
+++ b/glance/tests/unit/test_image_cache.py
@@ -30,7 +30,7 @@ from glance.common import exception
 from glance import image_cache
 from glance.openstack.common import units
 #NOTE(bcwaldon): This is imported to load the registry config options
-import glance.registry
+import glance.registry  # noqa
 import glance.store.filesystem as fs_store
 import glance.store.s3 as s3_store
 from glance.tests import utils as test_utils
@@ -483,7 +483,7 @@ class TestImageCacheXattr(test_utils.BaseTestCase,
 
         if not getattr(self, 'inited', False):
             try:
-                import xattr
+                import xattr  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
@@ -521,7 +521,7 @@ class TestImageCacheSqlite(test_utils.BaseTestCase,
 
         if not getattr(self, 'inited', False):
             try:
-                import sqlite3
+                import sqlite3  # noqa
             except ImportError:
                 self.inited = True
                 self.disabled = True
diff --git a/glance/tests/unit/v1/test_registry_client.py b/glance/tests/unit/v1/test_registry_client.py
index 385f918e9b..2409427c09 100644
--- a/glance/tests/unit/v1/test_registry_client.py
+++ b/glance/tests/unit/v1/test_registry_client.py
@@ -18,10 +18,8 @@
 import copy
 import datetime
 import os
-import stubout
 
 import mox
-
 import testtools
 
 from glance.common import config
diff --git a/glance/tests/utils.py b/glance/tests/utils.py
index ed1bf0aa19..5c3a707a1d 100644
--- a/glance/tests/utils.py
+++ b/glance/tests/utils.py
@@ -26,7 +26,6 @@ import shutil
 import socket
 import StringIO
 import subprocess
-import sys
 
 import fixtures
 from oslo.config import cfg
diff --git a/tools/install_venv.py b/tools/install_venv.py
index 653fd6aa2a..46309af8fa 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -26,7 +26,6 @@ Installation script for Glance's development virtualenv
 from __future__ import print_function
 
 import os
-import subprocess
 import sys
 
 import install_venv_common as install_venv
diff --git a/tox.ini b/tox.ini
index ceb16d47c0..50c59d25e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,8 +32,6 @@ commands = {posargs}
 # E126  continuation line over-indented for hanging indent
 # E711  comparison to None should be 'if cond is not None:'
 # E712  comparison to True should be 'if cond is True:' or 'if cond:'
-# F401  'module' imported but unused
-# F403  unable to detect undefined names with wildcard import
 # F811  redefinition of function
 # F821  undefined name 'name'
 # F841  local variable 'name' assigned but never used
@@ -49,6 +47,6 @@ commands = {posargs}
 # H701  Empty localisation string
 # H702  Formatting operation should be outside of localization
 # H703  multiple positional placeholders
-ignore = E125,E126,E711,E712,F401,F403,F811,F821,F841,H102,H201,H202,H233,H301,H302,H306,H402,H404,H701,H702,H703
+ignore = E125,E126,E711,E712,F811,F821,F841,H102,H201,H202,H233,H301,H302,H306,H402,H404,H701,H702,H703
 builtins = _
 exclude = .venv,.git,.tox,dist,doc,etc,*glance/locale*,*openstack/common*,*lib/python*,*egg,build