diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-05-16 14:06:59 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-05-23 09:14:05 -0500 |
| commit | b05ebb87805de478b8d264b5636cc0d22d0a7946 (patch) | |
| tree | 676a9cedaefa62b1f3e03755e564ff4dee951675 | |
| parent | d6fb11c1b7938a8e72690e05ea6d118df053c98d (diff) | |
| download | keystone-b05ebb87805de478b8d264b5636cc0d22d0a7946.tar.gz keystone-b05ebb87805de478b8d264b5636cc0d22d0a7946.tar.xz keystone-b05ebb87805de478b8d264b5636cc0d22d0a7946.zip | |
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
28 files changed, 29 insertions, 32 deletions
diff --git a/bin/keystone-all b/bin/keystone-all index ff3143bd..0ed21790 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 614f3634..570e0384 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 d067b981..4aaa2e12 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 ed0fa60c..4932206c 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 17aca3b1..adc3a276 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 285a7ee0..b069482f 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 efc1fd4e..c8df800c 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 8260764e..7941ca02 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 98ed9a2a..2fa03cd7 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 77c42ba1..45a6f0db 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 11fa0a40..21da5544 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 b60dacb1..fe0d51d7 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 caad8674..444435b2 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 4b782183..6eb9aa43 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 4fb4bab0..e0d488f3 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 50c4039f..3fbaa09b 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 84de6dcf..c77b04e9 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 c4a07cbc..74eaa95e 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 8f4a83f0..a07019f1 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 bef9c3c7..4891a210 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 58853cc6..514db788 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 17903c93..043f9e8f 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 85ed395c..1135f784 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 121905e4..5ed700eb 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 eb4f012a..889cd39a 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 9c6a22f0..6b47460e 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 eaad10d3..dd4072bb 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 @@ -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 |