From 5568ffd45bae092fbc024b067e1020fb59041490 Mon Sep 17 00:00:00 2001 From: Brandon Bell Date: Fri, 26 Oct 2018 21:43:53 -0500 Subject: [PATCH] Fix syntax error for Python 2.6 (#47635) * Fix syntax error for Python 2.6 * Removing consul.py from pylint/ignore.txt --- lib/ansible/modules/clustering/consul.py | 2 +- test/sanity/pylint/ignore.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/modules/clustering/consul.py b/lib/ansible/modules/clustering/consul.py index d7cda719a92..134abde6069 100644 --- a/lib/ansible/modules/clustering/consul.py +++ b/lib/ansible/modules/clustering/consul.py @@ -475,7 +475,7 @@ class ConsulCheck(object): if duration: duration_units = ['ns', 'us', 'ms', 's', 'm', 'h'] if not any((duration.endswith(suffix) for suffix in duration_units)): - duration = "{}s".format(duration) + duration = "{0}s".format(duration) return duration def register(self, consul_api): diff --git a/test/sanity/pylint/ignore.txt b/test/sanity/pylint/ignore.txt index 6b472f20053..d7b0ee4a2ae 100644 --- a/test/sanity/pylint/ignore.txt +++ b/test/sanity/pylint/ignore.txt @@ -28,7 +28,6 @@ lib/ansible/modules/cloud/webfaction/webfaction_db.py ansible-format-automatic-s lib/ansible/modules/cloud/webfaction/webfaction_domain.py ansible-format-automatic-specification lib/ansible/modules/cloud/webfaction/webfaction_mailbox.py ansible-format-automatic-specification lib/ansible/modules/cloud/webfaction/webfaction_site.py ansible-format-automatic-specification -lib/ansible/modules/clustering/consul.py ansible-format-automatic-specification lib/ansible/modules/monitoring/grafana_plugin.py ansible-format-automatic-specification lib/ansible/modules/net_tools/dnsmadeeasy.py ansible-format-automatic-specification lib/ansible/modules/net_tools/ipinfoio_facts.py ansible-format-automatic-specification