Merge pull request #10 from f500/python3

use items instead of iteritems to make the role compatible with python 3
f500 · Oct 29, 2018 · 55840be · 55840be
2 parents b6f7c67 + ba1eeea
commit 55840be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -79,7 +79,7 @@ Again, no need to copy the entire dictionary.
 Note that headers added to the `http` context will be ignored when you add headers in a `server` or `location` context.
 So don't forget to combine all headers:
 
-    {% for key, value in (nginx_http_headers_default | combine(nginx_http_headers) | combine(specialized_headers)).iteritems() %}
+    {% for key, value in (nginx_http_headers_default | combine(nginx_http_headers) | combine(specialized_headers)).items() %}
     add_header  {{ key }} "{{ value }}"  always;
     {% endfor %}
 

diff --git a/templates/nginx.conf.j2 b/templates/nginx.conf.j2
@@ -18,7 +18,7 @@ http {
     access_log  /var/log/nginx/access.log  main;
     error_log   /var/log/nginx/error.log   warn;
 
-{% for key, value in (nginx_http_params_default | combine(nginx_http_params)).iteritems() %}
+{% for key, value in (nginx_http_params_default | combine(nginx_http_params)).items() %}
 {% if value is sameas True %}
     {{ key }}  on;
 {% elif value is sameas False %}
@@ -28,7 +28,7 @@ http {
 {% endif %}
 {% endfor %}
 
-{% for key, value in (nginx_http_headers_default | combine(nginx_http_headers)).iteritems() %}
+{% for key, value in (nginx_http_headers_default | combine(nginx_http_headers)).items() %}
     add_header  {{ key }} "{{ value }}"  always;
 {% endfor %}