Просмотр исходного кода

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

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.
tags/v0.57.0
Raphaël Hertzog 10 лет назад
Родитель
Сommit
8a828b506e
2 измененных файлов: 6 добавлений и 6 удалений
  1. +4
    -4
      salt/files/master.d/_defaults.conf
  2. +2
    -2
      salt/files/minion.d/_defaults.conf

+ 4
- 4
salt/files/master.d/_defaults.conf Просмотреть файл

@@ -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 %}

+ 2
- 2
salt/files/minion.d/_defaults.conf Просмотреть файл

@@ -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 -%}

Загрузка…
Отмена
Сохранить