Merge pull request #9 from abednarik/fix_deprecated_iteritems_method

Replace deprecated iteritems() with items()
This commit is contained in:
puneet kandhari 2015-11-17 07:28:48 -06:00
commit 9130acbf90
2 changed files with 6 additions and 6 deletions

View File

@ -3,7 +3,7 @@
# This config file is managed by salt. # 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 %} {%- if value is string or value is number %}
{{ directive }} {{ value }} {{ directive }} {{ value }}
{%- else %} {%- else %}

View File

@ -16,20 +16,20 @@
{%- endif -%} {%- endif -%}
{%- endmacro %} {%- endmacro %}
{% for directive, value in globals.iteritems() -%} {% for directive, value in globals.items() -%}
{{ print_directive(directive, value) }} {{ print_directive(directive, value) }}
{% endfor %} {% endfor %}
{%- for host, directives in hosts.iteritems() %} {%- for host, directives in hosts.items() %}
[{{ host }}] [{{ host }}]
{%- for directive, value in directives.iteritems() %} {%- for directive, value in directives.items() %}
{{ print_directive(directive, value) }} {{ print_directive(directive, value) }}
{%- endfor %} {%- endfor %}
{% endfor %} {% endfor %}
{%- for group, directives in groups.iteritems() %} {%- for group, directives in groups.items() %}
[{{ group }}] [{{ group }}]
{%- for directive, value in directives.iteritems() %} {%- for directive, value in directives.items() %}
{{ print_directive(directive, value) }} {{ print_directive(directive, value) }}
{%- endfor %} {%- endfor %}
{% endfor %} {% endfor %}