From e43cd4e0df594ab31855388d6014b9bb203f235e Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Mon, 11 Nov 2019 11:35:33 +0100
Subject: [PATCH] Replace .iteritems() with .items()

---
 deploy/certs.sls   | 2 +-
 deploy/django.sls  | 2 +-
 deploy/gitlab.sls  | 2 +-
 deploy/macro.jinja | 2 +-
 deploy/map.jinja   | 2 +-
 deploy/spm.sls     | 2 +-
 deploy/user.sls    | 2 +-
 deploy/venv.sls    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/deploy/certs.sls b/deploy/certs.sls
index 3219d66..c812a7d 100644
--- a/deploy/certs.sls
+++ b/deploy/certs.sls
@@ -21,7 +21,7 @@ deploy_cert_create_dir:
     - mode: 755
 {% endif %}
 
-{% for name, cert in deploy.certs.iteritems() %}
+{% for name, cert in deploy.certs.items() %}
 
 {% set cert_group_name = 'cert-' + name %}
 
diff --git a/deploy/django.sls b/deploy/django.sls
index 30b1c3a..2c68aea 100644
--- a/deploy/django.sls
+++ b/deploy/django.sls
@@ -18,7 +18,7 @@ deploy_sqlite_directory:
     - require:
       - user: deployer
 
-{% for project_name, project_config in deploy.projects.iteritems() if project_config.get('django', False) %}
+{% for project_name, project_config in deploy.projects.items() if project_config.get('django', False) %}
 {% set dj_config = project_config.django %}
 {% set venv_config = project_config.venv %}
 
diff --git a/deploy/gitlab.sls b/deploy/gitlab.sls
index 8825bb0..6bb03d9 100644
--- a/deploy/gitlab.sls
+++ b/deploy/gitlab.sls
@@ -18,7 +18,7 @@ deploy_target_directory:
       - user: deployer
       - group: deployer
 
-{% for project_name, project_config in deploy.projects.iteritems() if project_config.get('gitlab', False) %}
+{% for project_name, project_config in deploy.projects.items() if project_config.get('gitlab', False) %}
 {% set repo_config = project_config.gitlab %}
 
 deploy_{{ project_name }}_clone_git:
diff --git a/deploy/macro.jinja b/deploy/macro.jinja
index 42d38c4..9fa2eba 100644
--- a/deploy/macro.jinja
+++ b/deploy/macro.jinja
@@ -1,6 +1,6 @@
 {# https://github.com/saltstack/salt/issues/28606#issuecomment-211537586 #}
 {%- macro deep_merge(a, b) %}
-{%-     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 v is not mapping %}
diff --git a/deploy/map.jinja b/deploy/map.jinja
index 9d91784..2239d63 100644
--- a/deploy/map.jinja
+++ b/deploy/map.jinja
@@ -7,7 +7,7 @@
 {# Some post processing of the pillar data that applies documented magic #}
 {# Here we mainly create pillar data based on surrounding information #}
 {# This makes the pillar easier to write... #}
-{% for name, config in deploy.projects.iteritems() %}
+{% for name, config in deploy.projects.items() %}
   {# The deployment path is set based on deploy_directory and project name #}
   {% do config.update({'path': deploy.config.deploy_directory + '/' + name }) %}
 
diff --git a/deploy/spm.sls b/deploy/spm.sls
index c4878db..4e42e03 100644
--- a/deploy/spm.sls
+++ b/deploy/spm.sls
@@ -1,6 +1,6 @@
 {% from "deploy/map.jinja" import deploy with context %}
 
-{% for project_name, project_config in deploy.projects.iteritems() if project_config.get('spm', False) %}
+{% for project_name, project_config in deploy.projects.items() if project_config.get('spm', False) %}
 {% set spm_config = project_config.spm %}
 
 {% if spm_config %}
diff --git a/deploy/user.sls b/deploy/user.sls
index 83af54b..90f123e 100644
--- a/deploy/user.sls
+++ b/deploy/user.sls
@@ -34,7 +34,7 @@ deploy_key:
     - group: deployer
     - makedirs: True
 
-{% for project_name, project_config in deploy.projects.iteritems() %}
+{% for project_name, project_config in deploy.projects.items() %}
 
 {% set config_user_groups = project_config.get('user_groups', []) %}
 {% set default_user_groups = [project_name, 'deployer'] %}
diff --git a/deploy/venv.sls b/deploy/venv.sls
index 7f8810d..27d73e6 100644
--- a/deploy/venv.sls
+++ b/deploy/venv.sls
@@ -22,7 +22,7 @@ deploy_venv_directory:
       - user: deployer
       - group: virtualenv
 
-{% for project_name, project_config in deploy.projects.iteritems() if project_config.get('venv', False) %}
+{% for project_name, project_config in deploy.projects.items() if project_config.get('venv', False) %}
 {% set venv_config = project_config.venv %}
 
 deploy_{{ project_name }}_venv:
-- 
GitLab