erp5: Support for python3 from aurel/zope4 branch.

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 70f30111e137d158aeca3d67c4abf643
+md5sum = ce8d03a1b4c1a9e5085ec54ea2744007
 
 [site-zcml]
 filename = site.zcml
@@ -90,11 +90,11 @@ md5sum = 06265195ca29805696873b6f8a57a5fd
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = e0567c8d7717d1ed5daf4555566c76cd
+md5sum = 8b4d6c29e9c5d8fb2e50e6ac96906d97
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in
-md5sum = 4149e3e83c9981586ffa123d31a08908
+md5sum = d2d98ed3fafce764991b72371e3e09d5
 
 [template-rsyslogd-cfg]
 filename = rsyslogd.cfg.in

stack/erp5/haproxy.cfg.in

@@ -211,6 +211,6 @@ frontend frontend_{{ group_name }}
 backend backend_{{ group_name }}_{{ name }}
   http-request replace-path ^/{{ name }}(.*) /VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ name }}\1
   timeout server 8h
-  server {{ name }} {{ urlparse.urlparse(url).netloc }}
+  server {{ name }} {{ urllib_parse.urlparse(url).netloc }}
 {%-  endfor %}
 {% endfor %}

stack/erp5/instance-balancer.cfg.in

@@ -205,7 +205,7 @@ template = {{ parameter_dict['template-haproxy-cfg'] }}
 rendered = ${directory:etc}/haproxy.cfg
 context =
   section parameter_dict haproxy-cfg-parameter-dict
-  import urlparse urlparse
+  import urllib_parse six.moves.urllib.parse
 extensions = jinja2.ext.do
 
 [haproxy-reload]

stack/erp5/zope.conf.in

@@ -153,17 +153,17 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
 %import {{ m }}
 {% endfor -%}
 {% set type_dict = {'neo': 'NEOStorage', 'zeo': 'zeoclient'} %}
-{% for name, zodb_dict in parameter_dict['zodb-dict'].iteritems() %}
+{% for name, zodb_dict in six.iteritems(parameter_dict['zodb-dict']) %}
 <zodb_db {{ name }}>
 {%- set storage_type = type_dict[zodb_dict.pop('type')] %}
 {%- set storage_dict = zodb_dict.pop('storage-dict') %}
 {%- do root_common.apply_overrides(zodb_dict, node_id) %}
-{%- for key, value in zodb_dict.iteritems() %}
+{%- for key, value in six.iteritems(zodb_dict) %}
   {{ key }} {{ value }}
 {%- endfor %}
   <{{ storage_type }}>
 {%- do root_common.apply_overrides(storage_dict, node_id) %}
-{%- for key, value in storage_dict.iteritems() %}
+{%- for key, value in six.iteritems(storage_dict) %}
     {{ key }} {{ value }}
 {%- endfor %}
   </{{ storage_type }}>