From dae63c69484ad894c89541803e269bc1afda70e2 Mon Sep 17 00:00:00 2001 From: abednarik Date: Tue, 17 Nov 2015 10:15:21 -0300 Subject: [PATCH] Replace deprecated iteritems() with items() --- munin/files/munin-node.conf | 2 +- munin/files/munin.conf | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/munin/files/munin-node.conf b/munin/files/munin-node.conf index 3ee596c..b8808af 100644 --- a/munin/files/munin-node.conf +++ b/munin/files/munin-node.conf @@ -3,7 +3,7 @@ # This config file is managed by salt. # -{%- for directive, value in config.iteritems() %} +{%- for directive, value in config.items() %} {%- if value is string or value is number %} {{ directive }} {{ value }} {%- else %} diff --git a/munin/files/munin.conf b/munin/files/munin.conf index 272a974..1fdcd0d 100644 --- a/munin/files/munin.conf +++ b/munin/files/munin.conf @@ -16,20 +16,20 @@ {%- endif -%} {%- endmacro %} -{% for directive, value in globals.iteritems() -%} +{% for directive, value in globals.items() -%} {{ print_directive(directive, value) }} {% endfor %} -{%- for host, directives in hosts.iteritems() %} +{%- for host, directives in hosts.items() %} [{{ host }}] - {%- for directive, value in directives.iteritems() %} + {%- for directive, value in directives.items() %} {{ print_directive(directive, value) }} {%- endfor %} {% endfor %} -{%- for group, directives in groups.iteritems() %} +{%- for group, directives in groups.items() %} [{{ group }}] - {%- for directive, value in directives.iteritems() %} + {%- for directive, value in directives.items() %} {{ print_directive(directive, value) }} {%- endfor %} {% endfor %}