diff --git a/bin/trove-manage b/bin/trove-manage index defae03d7f..84e641c05f 100755 --- a/bin/trove-manage +++ b/bin/trove-manage @@ -125,7 +125,7 @@ if __name__ == '__main__': Commands().execute() sys.exit(0) except TypeError as e: - print _("Possible wrong number of arguments supplied %s" % e) + print _("Possible wrong number of arguments supplied %s") % e sys.exit(2) except Exception: print _("Command failed, please check log for more info") diff --git a/tox.ini b/tox.ini index 66f8efa4c9..bd8d76fdfe 100644 --- a/tox.ini +++ b/tox.ini @@ -33,7 +33,7 @@ commands = {posargs} [flake8] show-source = True -ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H233,H301,H306,H401,H402,H403,H404,H702 +ignore = E125,F401,F403,F811,F821,F841,H102,H103,H201,H233,H301,H306,H401,H402,H403,H404 builtins = _ exclude=.venv,.tox,dist,doc,openstack,*egg,rsdns,tools,etc filename=*.py,trove-* diff --git a/trove/guestagent/manager/mysql.py b/trove/guestagent/manager/mysql.py index a0a470aec9..10a6be9aa2 100644 --- a/trove/guestagent/manager/mysql.py +++ b/trove/guestagent/manager/mysql.py @@ -74,7 +74,7 @@ class Manager(periodic_task.PeriodicTasks): return MySqlAdmin().is_root_enabled() def _perform_restore(self, backup_id, context, restore_location, app): - LOG.info(_("Restoring database from backup %s" % backup_id)) + LOG.info(_("Restoring database from backup %s") % backup_id) try: backup.restore(context, backup_id, restore_location) except Exception as e: diff --git a/trove/guestagent/pkg.py b/trove/guestagent/pkg.py index 60522c47a8..d9cb3c35e9 100644 --- a/trove/guestagent/pkg.py +++ b/trove/guestagent/pkg.py @@ -289,7 +289,7 @@ class DebianPackagerMixin(BasePackagerMixin): LOG.error(msg) raise exception.GuestError(msg) if parts[1] != package_name: - msg = _("Unexpected output:[1] = %s" % str(parts[1])) + msg = _("Unexpected output:[1] = %s") % str(parts[1]) LOG.error(msg) raise exception.GuestError(msg) if parts[0] == 'un' or parts[2] == '': diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 118579c459..7a81589bd3 100644 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -440,8 +440,8 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): server.status == InstanceStatus.ERROR): LOG.error(_("Instance IP not available, " "instance (%(instance)s): " - "server had status (%(status)s)." % - {'instance': self.id, 'status': server.status})) + "server had status (%(status)s).") % + {'instance': self.id, 'status': server.status}) raise TroveError(status=server.status) poll_until(get_server, ip_is_available,