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

Use items() method instead of iteritems() for Python 3 compatibility

Browse Source 
In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.
This commit is contained in:
Raphaël Hertzog 2014-12-23 17:38:50 +01:00
parent 2f2cd972ac
commit 8a828b506e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/files/master.d/_defaults.conf
View File

@ -613,10 +613,10 @@ fileserver_backend:
gitfs_remotes:
{%- for remote in master['gitfs_remotes'] %}
{%- if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() %}
{%- for repo, children in remote.items() %}
- {{ repo }}:
{%- for child in children %}
{%- for key, value in child.iteritems() %}
{%- for key, value in child.items() %}
- {{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}
@ -942,7 +942,7 @@ win_gitrepos:
##### Halite #####
##########################################
halite:
{% for name, value in master['halite'].iteritems() %}
{% for name, value in master['halite'].items() %}
{{ name }}: {{ value }}
{% endfor %}
{% endif %}
@ -951,7 +951,7 @@ halite:
##### rest_cherrypy #####
##########################################
rest_cherrypy:
{% for name, value in master['rest_cherrypy'].iteritems() %}
{% for name, value in master['rest_cherrypy'].items() %}
{{ name }}: {{ value }}
{% endfor %}
{% endif %}

4
salt/files/minion.d/_defaults.conf
View File

@ -458,10 +458,10 @@ file_roots:
gitfs_remotes:
{%- for remote in minion['gitfs_remotes'] %}
{%- if remote is iterable and remote is not string %}
{%- for repo, children in remote.iteritems() %}
{%- for repo, children in remote.items() %}
- {{ repo }}:
{%- for child in children %}
{%- for key, value in child.iteritems() %}
{%- for key, value in child.items() %}
- {{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}