From 7a819c368bfc067b988c76f5e0caea83f78ba35b Mon Sep 17 00:00:00 2001 From: Denis Poisson Date: Fri, 22 Sep 2017 09:28:03 +0200 Subject: [PATCH] split fix_lint5 part 1 --- monasca-log-persister/kafka_wait_for_topics.py | 1 + monasca-log-persister/start.sh | 2 +- monasca-log-persister/template.py | 5 +++-- monasca-log-transformer/kafka_wait_for_topics.py | 1 + monasca-log-transformer/start.sh | 2 +- monasca-log-transformer/template.py | 5 +++-- monasca-notification/kafka_wait_for_topics.py | 1 + monasca-notification/start.sh | 4 ++-- monasca-notification/template.py | 11 ++++++----- monasca-persister-python/kafka_wait_for_topics.py | 1 + monasca-persister-python/start.sh | 2 +- monasca-persister-python/template.py | 5 +++-- 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/monasca-log-persister/kafka_wait_for_topics.py b/monasca-log-persister/kafka_wait_for_topics.py index 7d6a7942a..e5c5b1c6b 100644 --- a/monasca-log-persister/kafka_wait_for_topics.py +++ b/monasca-log-persister/kafka_wait_for_topics.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # diff --git a/monasca-log-persister/start.sh b/monasca-log-persister/start.sh index 790fecc4a..f73bddc81 100755 --- a/monasca-log-persister/start.sh +++ b/monasca-log-persister/start.sh @@ -7,7 +7,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then echo "Waiting for Kafka topics to become available..." success="false" - for i in $(seq $KAFKA_WAIT_RETRIES); do + for i in $(seq "$KAFKA_WAIT_RETRIES"); do python /kafka_wait_for_topics.py if [ $? -eq 0 ]; then success="true" diff --git a/monasca-log-persister/template.py b/monasca-log-persister/template.py index e83ec2fcf..c25263129 100755 --- a/monasca-log-persister/template.py +++ b/monasca-log-persister/template.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # @@ -31,8 +32,8 @@ def main(): out_path = sys.argv[2] with open(in_path, 'r') as in_file, open(out_path, 'w') as out_file: - t = Template(in_file.read()) - out_file.write(t.render(os.environ)) + tmle = Template(in_file.read()) + out_file.write(tmle.render(os.environ)) if __name__ == '__main__': main() diff --git a/monasca-log-transformer/kafka_wait_for_topics.py b/monasca-log-transformer/kafka_wait_for_topics.py index 7d6a7942a..e5c5b1c6b 100644 --- a/monasca-log-transformer/kafka_wait_for_topics.py +++ b/monasca-log-transformer/kafka_wait_for_topics.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # diff --git a/monasca-log-transformer/start.sh b/monasca-log-transformer/start.sh index c12c7e6f4..5ec52abb9 100755 --- a/monasca-log-transformer/start.sh +++ b/monasca-log-transformer/start.sh @@ -7,7 +7,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then echo "Waiting for Kafka topics to become available..." success="false" - for i in $(seq $KAFKA_WAIT_RETRIES); do + for i in $(seq "$KAFKA_WAIT_RETRIES"); do python /kafka_wait_for_topics.py if [ $? -eq 0 ]; then success="true" diff --git a/monasca-log-transformer/template.py b/monasca-log-transformer/template.py index e83ec2fcf..c25263129 100755 --- a/monasca-log-transformer/template.py +++ b/monasca-log-transformer/template.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # @@ -31,8 +32,8 @@ def main(): out_path = sys.argv[2] with open(in_path, 'r') as in_file, open(out_path, 'w') as out_file: - t = Template(in_file.read()) - out_file.write(t.render(os.environ)) + tmle = Template(in_file.read()) + out_file.write(tmle.render(os.environ)) if __name__ == '__main__': main() diff --git a/monasca-notification/kafka_wait_for_topics.py b/monasca-notification/kafka_wait_for_topics.py index 7d6a7942a..e5c5b1c6b 100644 --- a/monasca-notification/kafka_wait_for_topics.py +++ b/monasca-notification/kafka_wait_for_topics.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # diff --git a/monasca-notification/start.sh b/monasca-notification/start.sh index a7bba88fd..1f26e0353 100755 --- a/monasca-notification/start.sh +++ b/monasca-notification/start.sh @@ -9,7 +9,7 @@ KAFKA_WAIT_DELAY=${KAFKA_WAIT_DELAY:-"5"} echo "Waiting for MySQL to become available..." success="false" -for i in $(seq $MYSQL_WAIT_RETRIES); do +for i in $(seq "$MYSQL_WAIT_RETRIES"); do mysqladmin status \ --host="$MYSQL_DB_HOST" \ --port="$MYSQL_DB_PORT" \ @@ -36,7 +36,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then echo "Waiting for Kafka topics to become available..." success="false" - for i in $(seq $KAFKA_WAIT_RETRIES); do + for i in $(seq "$KAFKA_WAIT_RETRIES"); do python /kafka_wait_for_topics.py if [ $? -eq 0 ]; then success="true" diff --git a/monasca-notification/template.py b/monasca-notification/template.py index 67a2fde62..5fbef42af 100755 --- a/monasca-notification/template.py +++ b/monasca-notification/template.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # @@ -30,11 +31,11 @@ def main(): out_path = sys.argv[2] with open(in_path, 'r') as in_file, open(out_path, 'w') as out_file: - t = Template(in_file.read(), - keep_trailing_newline=True, - lstrip_blocks=True, - trim_blocks=True) - out_file.write(t.render(os.environ)) + tmle = Template(in_file.read(), + keep_trailing_newline=True, + lstrip_blocks=True, + trim_blocks=True) + out_file.write(tmle.render(os.environ)) if __name__ == '__main__': main() diff --git a/monasca-persister-python/kafka_wait_for_topics.py b/monasca-persister-python/kafka_wait_for_topics.py index 7d6a7942a..e5c5b1c6b 100644 --- a/monasca-persister-python/kafka_wait_for_topics.py +++ b/monasca-persister-python/kafka_wait_for_topics.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # diff --git a/monasca-persister-python/start.sh b/monasca-persister-python/start.sh index de382a57f..dec08f38b 100755 --- a/monasca-persister-python/start.sh +++ b/monasca-persister-python/start.sh @@ -9,7 +9,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then echo "Waiting for Kafka topics to become available..." success="false" - for i in $(seq $KAFKA_WAIT_RETRIES); do + for i in $(seq "$KAFKA_WAIT_RETRIES"); do python /kafka_wait_for_topics.py if [ $? -eq 0 ]; then success="true" diff --git a/monasca-persister-python/template.py b/monasca-persister-python/template.py index fddbdd086..ccea28560 100755 --- a/monasca-persister-python/template.py +++ b/monasca-persister-python/template.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# coding=utf-8 # (C) Copyright 2017 Hewlett Packard Enterprise Development LP # @@ -30,8 +31,8 @@ def main(): out_path = sys.argv[2] with open(in_path, 'r') as in_file, open(out_path, 'w') as out_file: - t = Template(in_file.read()) - out_file.write(t.render(os.environ)) + tmle = Template(in_file.read()) + out_file.write(tmle.render(os.environ)) if __name__ == '__main__': main()