From b05ebb87805de478b8d264b5636cc0d22d0a7946 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Thu, 16 May 2013 14:06:59 -0500 Subject: [PATCH] Satisfy flake8 import rules F401 and F403 - Removed unused imports - Ignore wildcard and unused imports from core modules (and avoid wildcard imports otherwise) to __init__ modules Change-Id: Ie2e5f61ae37481f5d248788cfd83dc92ffddbd91 --- bin/keystone-all | 1 - keystone/auth/__init__.py | 3 ++- keystone/catalog/__init__.py | 1 + keystone/common/cms.py | 2 +- keystone/common/ldap/__init__.py | 1 + keystone/common/sql/__init__.py | 1 + .../sql/migrate_repo/versions/003_token_valid.py | 16 ++++++++-------- .../versions/009_normalize_identity.py | 1 - .../migrate_repo/versions/017_membership_role.py | 3 --- .../versions/018_add_trust_tables.py | 1 - .../sql/migrate_repo/versions/019_fixup_role.py | 5 ----- .../versions/020_migrate_metadata_table_roles.py | 3 --- .../versions/021_add_trust_to_token.py | 4 ---- keystone/contrib/access/__init__.py | 1 + keystone/contrib/admin_crud/__init__.py | 1 + keystone/contrib/ec2/__init__.py | 1 + keystone/contrib/s3/__init__.py | 1 + keystone/contrib/stats/__init__.py | 1 + keystone/contrib/user_crud/__init__.py | 1 + keystone/credential/__init__.py | 1 + keystone/identity/__init__.py | 1 + keystone/identity/backends/ldap/__init__.py | 1 + keystone/middleware/__init__.py | 1 + keystone/policy/__init__.py | 1 + keystone/token/__init__.py | 1 + keystone/trust/__init__.py | 3 ++- tests/test_v3_credential.py | 2 -- tox.ini | 2 +- 28 files changed, 29 insertions(+), 32 deletions(-) diff --git a/bin/keystone-all b/bin/keystone-all index ff3143bdc3..0ed2179080 100755 --- a/bin/keystone-all +++ b/bin/keystone-all @@ -21,7 +21,6 @@ if os.path.exists(os.path.join(possible_topdir, from paste import deploy from keystone import config -from keystone.common import wsgi from keystone.common import wsgi_server from keystone.common import utils from keystone.openstack.common import importutils diff --git a/keystone/auth/__init__.py b/keystone/auth/__init__.py index 614f3634f3..570e038427 100644 --- a/keystone/auth/__init__.py +++ b/keystone/auth/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2013 OpenStack LLC # @@ -14,6 +15,6 @@ # License for the specific language governing permissions and limitations # under the License. -from keystone.auth.core import AuthMethodHandler from keystone.auth import controllers +from keystone.auth.core import * from keystone.auth import routers diff --git a/keystone/catalog/__init__.py b/keystone/catalog/__init__.py index d067b981ae..4aaa2e1241 100644 --- a/keystone/catalog/__init__.py +++ b/keystone/catalog/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/common/cms.py b/keystone/common/cms.py index ed0fa60c60..4932206c75 100644 --- a/keystone/common/cms.py +++ b/keystone/common/cms.py @@ -21,7 +21,7 @@ def _ensure_subprocess(): else: import subprocess except ImportError: - import subprocess + import subprocess # nopep8 def cms_verify(formatted, signing_cert_file_name, ca_file_name): diff --git a/keystone/common/ldap/__init__.py b/keystone/common/ldap/__init__.py index 17aca3b1a7..adc3a27675 100644 --- a/keystone/common/ldap/__init__.py +++ b/keystone/common/ldap/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/common/sql/__init__.py b/keystone/common/sql/__init__.py index 285a7ee0e6..b069482f82 100644 --- a/keystone/common/sql/__init__.py +++ b/keystone/common/sql/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/common/sql/migrate_repo/versions/003_token_valid.py b/keystone/common/sql/migrate_repo/versions/003_token_valid.py index efc1fd4e7a..c8df800cc0 100644 --- a/keystone/common/sql/migrate_repo/versions/003_token_valid.py +++ b/keystone/common/sql/migrate_repo/versions/003_token_valid.py @@ -14,25 +14,25 @@ # License for the specific language governing permissions and limitations # under the License. - -from sqlalchemy import * +import sqlalchemy as sql def upgrade(migrate_engine): # Upgrade operations go here. Don't create your own engine; bind - meta = MetaData() + meta = sql.MetaData() meta.bind = migrate_engine - token = Table('token', meta, autoload=True) + token = sql.Table('token', meta, autoload=True) # creating the column immediately with nullable=False fails with # PostgreSQL (LP 1068181), so do it in two steps instead - valid = Column("valid", Boolean(), ColumnDefault(True), nullable=True) + valid = sql.Column( + 'valid', sql.Boolean(), sql.ColumnDefault(True), nullable=True) valid.create(token, populate_default=True) - valid.alter(type=Boolean(), default=True, nullable=False) + valid.alter(type=sql.Boolean(), default=True, nullable=False) def downgrade(migrate_engine): - meta = MetaData() + meta = sql.MetaData() meta.bind = migrate_engine - token = Table('token', meta, autoload=True) + token = sql.Table('token', meta, autoload=True) token.drop_column('valid') diff --git a/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py index 8260764ef7..7941ca0229 100644 --- a/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py +++ b/keystone/common/sql/migrate_repo/versions/009_normalize_identity.py @@ -17,7 +17,6 @@ from sqlalchemy import Column, MetaData, String, Table, Text, types from sqlalchemy.orm import sessionmaker -from keystone import config #sqlite doesn't support dropping columns. Copy to a new table instead diff --git a/keystone/common/sql/migrate_repo/versions/017_membership_role.py b/keystone/common/sql/migrate_repo/versions/017_membership_role.py index 98ed9a2a58..2fa03cd77d 100644 --- a/keystone/common/sql/migrate_repo/versions/017_membership_role.py +++ b/keystone/common/sql/migrate_repo/versions/017_membership_role.py @@ -1,11 +1,8 @@ import json -import uuid import sqlalchemy as sql -from sqlalchemy import orm from keystone import config -from keystone import exception CONF = config.CONF diff --git a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py index 77c42ba108..45a6f0dbfb 100644 --- a/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py +++ b/keystone/common/sql/migrate_repo/versions/018_add_trust_tables.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import migrate import sqlalchemy as sql diff --git a/keystone/common/sql/migrate_repo/versions/019_fixup_role.py b/keystone/common/sql/migrate_repo/versions/019_fixup_role.py index 11fa0a40ad..21da554425 100644 --- a/keystone/common/sql/migrate_repo/versions/019_fixup_role.py +++ b/keystone/common/sql/migrate_repo/versions/019_fixup_role.py @@ -1,11 +1,6 @@ -import json -import uuid - import sqlalchemy as sql -from sqlalchemy import orm from keystone import config -from keystone import exception CONF = config.CONF diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py index b60dacb113..fe0d51d793 100644 --- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py +++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py @@ -1,11 +1,8 @@ import json -import uuid import sqlalchemy as sql -from sqlalchemy import orm from keystone import config -from keystone import exception CONF = config.CONF diff --git a/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py index caad867464..444435b2b1 100644 --- a/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py +++ b/keystone/common/sql/migrate_repo/versions/021_add_trust_to_token.py @@ -14,12 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. - import sqlalchemy from sqlalchemy import exc -from sqlalchemy.orm import sessionmaker - -from keystone import config def downgrade_token_table_with_column_drop(meta, migrate_engine): diff --git a/keystone/contrib/access/__init__.py b/keystone/contrib/access/__init__.py index 4b78218320..6eb9aa43eb 100644 --- a/keystone/contrib/access/__init__.py +++ b/keystone/contrib/access/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2013 OpenStack LLC # diff --git a/keystone/contrib/admin_crud/__init__.py b/keystone/contrib/admin_crud/__init__.py index 4fb4bab057..e0d488f3e8 100644 --- a/keystone/contrib/admin_crud/__init__.py +++ b/keystone/contrib/admin_crud/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/contrib/ec2/__init__.py b/keystone/contrib/ec2/__init__.py index 50c4039f64..3fbaa09bad 100644 --- a/keystone/contrib/ec2/__init__.py +++ b/keystone/contrib/ec2/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/contrib/s3/__init__.py b/keystone/contrib/s3/__init__.py index 84de6dcffe..c77b04e900 100644 --- a/keystone/contrib/s3/__init__.py +++ b/keystone/contrib/s3/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/contrib/stats/__init__.py b/keystone/contrib/stats/__init__.py index c4a07cbc1d..74eaa95eae 100644 --- a/keystone/contrib/stats/__init__.py +++ b/keystone/contrib/stats/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/contrib/user_crud/__init__.py b/keystone/contrib/user_crud/__init__.py index 8f4a83f045..a07019f1ef 100644 --- a/keystone/contrib/user_crud/__init__.py +++ b/keystone/contrib/user_crud/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 Red Hat, Inc # diff --git a/keystone/credential/__init__.py b/keystone/credential/__init__.py index bef9c3c745..4891a21039 100644 --- a/keystone/credential/__init__.py +++ b/keystone/credential/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2013 OpenStack LLC # diff --git a/keystone/identity/__init__.py b/keystone/identity/__init__.py index 58853cc678..514db78836 100644 --- a/keystone/identity/__init__.py +++ b/keystone/identity/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/identity/backends/ldap/__init__.py b/keystone/identity/backends/ldap/__init__.py index 17903c9358..043f9e8f28 100644 --- a/keystone/identity/backends/ldap/__init__.py +++ b/keystone/identity/backends/ldap/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/middleware/__init__.py b/keystone/middleware/__init__.py index 85ed395cae..1135f78430 100644 --- a/keystone/middleware/__init__.py +++ b/keystone/middleware/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/policy/__init__.py b/keystone/policy/__init__.py index 121905e464..5ed700eb5b 100644 --- a/keystone/policy/__init__.py +++ b/keystone/policy/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/token/__init__.py b/keystone/token/__init__.py index eb4f012a30..889cd39af6 100644 --- a/keystone/token/__init__.py +++ b/keystone/token/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # diff --git a/keystone/trust/__init__.py b/keystone/trust/__init__.py index 9c6a22f067..6b47460ec2 100644 --- a/keystone/trust/__init__.py +++ b/keystone/trust/__init__.py @@ -1,4 +1,5 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# flake8: noqa # Copyright 2012 OpenStack LLC # @@ -14,6 +15,6 @@ # License for the specific language governing permissions and limitations # under the License. -from keystone.trust.core import Manager, Driver from keystone.trust import controllers +from keystone.trust.core import * from keystone.trust import routers diff --git a/tests/test_v3_credential.py b/tests/test_v3_credential.py index eaad10d345..dd4072bbec 100644 --- a/tests/test_v3_credential.py +++ b/tests/test_v3_credential.py @@ -16,8 +16,6 @@ import uuid -from keystone import exception - import test_v3 diff --git a/tox.ini b/tox.ini index d9ada139f4..e56e56d840 100644 --- a/tox.ini +++ b/tox.ini @@ -30,6 +30,6 @@ commands = {posargs} [flake8] show-source = true -ignore = H,F841,F401,F403 +ignore = H,F841 builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor