saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #330 from aboe76/fix_deprecated_iteritems

Browse Source 
fix #296 deprecated iteritems() and replace it with items()
This commit is contained in:
Niels Abspoel 2017-08-29 00:11:12 +02:00 committed by GitHub
commit 228f74b660
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/map.jinja
View File

@ -5,7 +5,7 @@
{#- This whole `'dict' in x.__class__.__name__` mess is a {#- This whole `'dict' in x.__class__.__name__` mess is a
workaround for the missing mapping test in CentOS 6's workaround for the missing mapping test in CentOS 6's
ancient Jinja2, see #193 #} ancient Jinja2, see #193 #}
{%- for k,v in b.iteritems() %} {%- for k,v in b.items() %}
{%- if v is string or v is number %} {%- if v is string or v is number %}
{%- do a.update({ k: v }) %} {%- do a.update({ k: v }) %}
{%- elif 'dict' not in v.__class__.__name__ %} {%- elif 'dict' not in v.__class__.__name__ %}