Skip to content

Commit

Permalink
Merge pull request #330 from aboe76/fix_deprecated_iteritems
Browse files Browse the repository at this point in the history
fix #296 deprecated iteritems() and replace it with items()
  • Loading branch information
aboe76 authored Aug 28, 2017
2 parents d6389b8 + e2973c6 commit 228f74b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{#- This whole `'dict' in x.__class__.__name__` mess is a
workaround for the missing mapping test in CentOS 6's
ancient Jinja2, see #193 #}
{%- for k,v in b.iteritems() %}
{%- for k,v in b.items() %}
{%- if v is string or v is number %}
{%- do a.update({ k: v }) %}
{%- elif 'dict' not in v.__class__.__name__ %}
Expand Down

0 comments on commit 228f74b

Please sign in to comment.