From 3873383df0347cbf27864733728462f74c7c46f0 Mon Sep 17 00:00:00 2001 From: "Chaozhe.Chen" Date: Wed, 10 Feb 2016 00:10:03 +0800 Subject: [PATCH] Use "# noqa" instead of "#flake8: noqa" "# flake8: noqa" option disables all checks for the whole file. To disable one line we should use "# noqa". This patch use "# noqa" instead of "#flake8: noqa" and fix some flake8 viilations. Change-Id: Ic9f7c82428728582cecf0fa40f288e9f20f5d5ca Closes-bug: #1540254 --- designate/api/v2/__init__.py | 5 ++-- .../versions/006_add_inherit_ttl_col.py | 7 +++--- .../tests/test_storage/test_sqlalchemy.py | 24 +++++++++---------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/designate/api/v2/__init__.py b/designate/api/v2/__init__.py index 8359cb33f..482ccff59 100644 --- a/designate/api/v2/__init__.py +++ b/designate/api/v2/__init__.py @@ -17,8 +17,6 @@ import pecan.deploy from oslo_config import cfg from oslo_log import log as logging -from designate.api.v2 import patches # flake8: noqa - LOG = logging.getLogger(__name__) @@ -34,6 +32,7 @@ OPTS = [ cfg.CONF.register_opts(OPTS, group='service:api') + def factory(global_config, **local_conf): if not cfg.CONF['service:api'].enable_api_v2: def disabled_app(environ, start_response): @@ -50,7 +49,7 @@ def factory(global_config, **local_conf): 'errors': { 404: '/errors/not_found', 405: '/errors/method_not_allowed', - '__force_dict__' : True + '__force_dict__': True } } } diff --git a/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py b/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py index 3ff167757..0846edabd 100644 --- a/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py +++ b/designate/backend/impl_powerdns/migrate_repo/versions/006_add_inherit_ttl_col.py @@ -1,4 +1,3 @@ -# flake8: noqa # Copyright 2012 Managed I.T. # # Author: Kiall Mac Innes @@ -37,13 +36,13 @@ def upgrade(migrate_engine): # join from powerdns.records -> powerdns.domains -> designate.domains, so # we can't perform the second half here. query = records_table.update().values(inherit_ttl=False) - query = query.where(records_table.c.ttl != None) + query = query.where(records_table.c.ttl is not None) query.execute() # If there are records without an explicity configured TTL, we'll need # a manual post-migration step. query = records_table.select() - query = query.where(records_table.c.ttl == None) + query = query.where(records_table.c.ttl is None) c = query.count() if c > 0: @@ -54,7 +53,7 @@ def upgrade(migrate_engine): '.inherit_ttl = 1;') LOG.warning(_LW('**** A manual post-migration step is required ****')) - LOG.warning(_LW('Please issue this query: %s' % pmq)) + LOG.warning(_LW('Please issue this query: %s') % pmq) def downgrade(migrate_engine): diff --git a/designate/tests/test_storage/test_sqlalchemy.py b/designate/tests/test_storage/test_sqlalchemy.py index 840b97c93..31ad0d8cf 100644 --- a/designate/tests/test_storage/test_sqlalchemy.py +++ b/designate/tests/test_storage/test_sqlalchemy.py @@ -47,7 +47,7 @@ class SqlalchemyStorageTest(StorageTestCase, TestCase): self.assertEqual(table_names, self.storage.engine.table_names()) def test_schema_table_indexes(self): - indexes_t = self.storage.engine.execute("SELECT * FROM sqlite_master WHERE type = 'index';") + indexes_t = self.storage.engine.execute("SELECT * FROM sqlite_master WHERE type = 'index';") # noqa indexes = {} # table name -> index names -> cmd for _, index_name, table_name, num, cmd in indexes_t: @@ -59,21 +59,21 @@ class SqlalchemyStorageTest(StorageTestCase, TestCase): expected = { "records": { - "record_created_at": "CREATE INDEX record_created_at ON records (created_at)", - "records_tenant": "CREATE INDEX records_tenant ON records (tenant_id)", - "update_status_index": "CREATE INDEX update_status_index ON records (status, zone_id, tenant_id, created_at, serial)" + "record_created_at": "CREATE INDEX record_created_at ON records (created_at)", # noqa + "records_tenant": "CREATE INDEX records_tenant ON records (tenant_id)", # noqa + "update_status_index": "CREATE INDEX update_status_index ON records (status, zone_id, tenant_id, created_at, serial)" # noqa }, "recordsets": { - "recordset_created_at": "CREATE INDEX recordset_created_at ON recordsets (created_at)", - "recordset_type_name": "CREATE INDEX recordset_type_name ON recordsets (type, name)", - "reverse_name_dom_id": "CREATE INDEX reverse_name_dom_id ON recordsets (reverse_name, zone_id)", - "rrset_type_domainid": "CREATE INDEX rrset_type_domainid ON recordsets (type, zone_id)" + "recordset_created_at": "CREATE INDEX recordset_created_at ON recordsets (created_at)", # noqa + "recordset_type_name": "CREATE INDEX recordset_type_name ON recordsets (type, name)", # noqa + "reverse_name_dom_id": "CREATE INDEX reverse_name_dom_id ON recordsets (reverse_name, zone_id)", # noqa + "rrset_type_domainid": "CREATE INDEX rrset_type_domainid ON recordsets (type, zone_id)" # noqa }, "zones": { - "reverse_name_deleted": "CREATE INDEX reverse_name_deleted ON zones (reverse_name, deleted)", - "zone_created_at": "CREATE INDEX zone_created_at ON zones (created_at)", + "reverse_name_deleted": "CREATE INDEX reverse_name_deleted ON zones (reverse_name, deleted)", # noqa + "zone_created_at": "CREATE INDEX zone_created_at ON zones (created_at)", # noqa "zone_deleted": "CREATE INDEX zone_deleted ON zones (deleted)", - "zone_tenant_deleted": "CREATE INDEX zone_tenant_deleted ON zones (tenant_id, deleted)" + "zone_tenant_deleted": "CREATE INDEX zone_tenant_deleted ON zones (tenant_id, deleted)" # noqa } - } # flake8: noqa + } self.assertDictEqual(expected, indexes)