cloudoooo: support python 3

software/cloudooo/buildout.hash.cfg

@@ -18,4 +18,4 @@ md5sum = 6e4431cf4b0a0d034402604b1e2844c0
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = e01ee969a45d44d386653a9eb699cc59
+md5sum = f65fef3a7c0ece347a6bd4dec24bce4b

software/cloudooo/instance-cloudooo.cfg.in

@@ -10,7 +10,7 @@
 {%   set next_port = slapparameter_dict.get(instance_parameter_dict['port-parameter-name'], next_port) | int -%}
 {% endif -%}
 {% do assert(next_port > 0) -%}
-{% set next_port = itertools.count(next_port).next -%}
+{% set next_port = itertools.count(next_port) -%}
 
 {% set backend_count = instance_parameter_dict['backend-count'] | int -%}
 {% if instance_parameter_dict.get('backend-count-parameter-name') -%}
@@ -34,8 +34,8 @@
 {%   set mimetype_entry_addition = mimetype_entry_addition ~ "\n" ~ slapparameter_dict.get(instance_parameter_dict['mimetype-entry-addition-parameter-name'], '') -%}
 {% endif -%}
 
-{% set apache_port = next_port() -%}
-{% set haproxy_port = next_port() -%}
+{% set apache_port = next(next_port) -%}
+{% set haproxy_port = next(next_port) -%}
 
 {% set apache_ip_list = [ipv4] -%}
 {% if ipv6_set -%}
@@ -207,8 +207,8 @@ ooo-uno-path = {{ parameter_dict['libreoffice-bin'] }}/basis-link/program
 {%   set name = 'cloudooo-' ~ index -%}
 [{{ cloudooo(name) }}]
 < = cloudooo-base
-port = {{ next_port() }}
-openoffice-port = {{ next_port() }}
+port = {{ next(next_port) }}
+openoffice-port = {{ next(next_port) }}
 configuration-file = ${directory:etc}/{{ name }}.cfg
 data-directory = ${directory:srv}/{{ name }}
 wrapper = ${directory:services}/{{ name }}