Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/312280
Change subject: Follow-up I695dab22: Fix style ...................................................................... Follow-up I695dab22: Fix style Change-Id: I9832c82aca8dfee9b292781f74c9fde967b6e6e6 --- M modules/openstack/files/kilo/designate/nova_fixed_multi/__init__.py M modules/openstack/files/kilo/designate/nova_fixed_multi/base.py M modules/openstack/files/liberty/designate/nova_fixed_multi/__init__.py M modules/openstack/files/liberty/designate/nova_fixed_multi/base.py M modules/openstack/files/mitaka/designate/nova_fixed_multi/__init__.py M modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py M tox.ini 7 files changed, 4 insertions(+), 67 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/312280/1 diff --git a/modules/openstack/files/kilo/designate/nova_fixed_multi/__init__.py b/modules/openstack/files/kilo/designate/nova_fixed_multi/__init__.py index 711e39e..e69de29 100644 --- a/modules/openstack/files/kilo/designate/nova_fixed_multi/__init__.py +++ b/modules/openstack/files/kilo/designate/nova_fixed_multi/__init__.py @@ -1,18 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import gettext -import logging diff --git a/modules/openstack/files/kilo/designate/nova_fixed_multi/base.py b/modules/openstack/files/kilo/designate/nova_fixed_multi/base.py index a4f544e..e90f803 100644 --- a/modules/openstack/files/kilo/designate/nova_fixed_multi/base.py +++ b/modules/openstack/files/kilo/designate/nova_fixed_multi/base.py @@ -17,15 +17,12 @@ # This is a slight form of the designate source file found at # designate/notification_handler/base.py -import abc from oslo_config import cfg -from designate import exceptions from oslo_log import log as logging from designate.central import rpcapi as central_rpcapi from designate.context import DesignateContext from designate.notification_handler.base import BaseAddressHandler from designate.objects import Record -from designate.plugin import ExtensionPlugin from keystoneclient.auth.identity import v3 from keystoneclient import client from keystoneclient import exceptions as keystoneexceptions @@ -206,7 +203,7 @@ passwd = cfg.CONF[self.name].keystone_auth_pass project = cfg.CONF[self.name].keystone_auth_project url = cfg.CONF[self.name].keystone_auth_url - except keyerror: + except KeyError: LOG.debug('Missing a config setting for keystone auth.') return diff --git a/modules/openstack/files/liberty/designate/nova_fixed_multi/__init__.py b/modules/openstack/files/liberty/designate/nova_fixed_multi/__init__.py index 711e39e..e69de29 100644 --- a/modules/openstack/files/liberty/designate/nova_fixed_multi/__init__.py +++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/__init__.py @@ -1,18 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import gettext -import logging diff --git a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py index a4f544e..e90f803 100644 --- a/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py +++ b/modules/openstack/files/liberty/designate/nova_fixed_multi/base.py @@ -17,15 +17,12 @@ # This is a slight form of the designate source file found at # designate/notification_handler/base.py -import abc from oslo_config import cfg -from designate import exceptions from oslo_log import log as logging from designate.central import rpcapi as central_rpcapi from designate.context import DesignateContext from designate.notification_handler.base import BaseAddressHandler from designate.objects import Record -from designate.plugin import ExtensionPlugin from keystoneclient.auth.identity import v3 from keystoneclient import client from keystoneclient import exceptions as keystoneexceptions @@ -206,7 +203,7 @@ passwd = cfg.CONF[self.name].keystone_auth_pass project = cfg.CONF[self.name].keystone_auth_project url = cfg.CONF[self.name].keystone_auth_url - except keyerror: + except KeyError: LOG.debug('Missing a config setting for keystone auth.') return diff --git a/modules/openstack/files/mitaka/designate/nova_fixed_multi/__init__.py b/modules/openstack/files/mitaka/designate/nova_fixed_multi/__init__.py index 711e39e..e69de29 100644 --- a/modules/openstack/files/mitaka/designate/nova_fixed_multi/__init__.py +++ b/modules/openstack/files/mitaka/designate/nova_fixed_multi/__init__.py @@ -1,18 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -import gettext -import logging diff --git a/modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py b/modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py index a4f544e..e90f803 100644 --- a/modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py +++ b/modules/openstack/files/mitaka/designate/nova_fixed_multi/base.py @@ -17,15 +17,12 @@ # This is a slight form of the designate source file found at # designate/notification_handler/base.py -import abc from oslo_config import cfg -from designate import exceptions from oslo_log import log as logging from designate.central import rpcapi as central_rpcapi from designate.context import DesignateContext from designate.notification_handler.base import BaseAddressHandler from designate.objects import Record -from designate.plugin import ExtensionPlugin from keystoneclient.auth.identity import v3 from keystoneclient import client from keystoneclient import exceptions as keystoneexceptions @@ -206,7 +203,7 @@ passwd = cfg.CONF[self.name].keystone_auth_pass project = cfg.CONF[self.name].keystone_auth_project url = cfg.CONF[self.name].keystone_auth_url - except keyerror: + except KeyError: LOG.debug('Missing a config setting for keystone auth.') return diff --git a/tox.ini b/tox.ini index b9a3d3e..5cd81db 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ # E402: module level import not at top of file ignore = E123,E133,E226,E241,E242,E402 # Upstream files that don't pass flake8 but should not be locally modified -exclude = modules/letsencrypt/files/acme_tiny.py,modules/varnish/files/varnishapi.py,modules/postgresql/files/check_postgres_replication_lag.py,modules/openstack/files/kilo/designate/nova_fixed_multi,modules/openstack/files/liberty/designate/nova_fixed_multi,modules/openstack/files/mitaka/designate/nova_fixed_multi +exclude = modules/letsencrypt/files/acme_tiny.py,modules/varnish/files/varnishapi.py,modules/postgresql/files/check_postgres_replication_lag.py [testenv] deps = -- To view, visit https://gerrit.wikimedia.org/r/312280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9832c82aca8dfee9b292781f74c9fde967b6e6e6 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <a...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
