zabbix_template: Fix encode error occurs when using Python2 (#297)

* Fix encode error occurs when using Python2 #233

* update modules

* add changelog file

* fix yamllint error

* Update changelogs/fragments/297-zabbix_template_modules.yml

Co-authored-by: Dusan Matejka <matejkadusan32@gmail.com>

Co-authored-by: Dusan Matejka <matejkadusan32@gmail.com>

changelogs/fragments/297-zabbix_template_modules.yml

@@ -0,0 +1,3 @@
+bugfixes:
+  - zabbix_template - fixed encode error when using Python2 (https://github.com/ansible-collections/community.zabbix/pull/297).
+  - zabbix_template_info - fixed encode error when using Python2 (https://github.com/ansible-collections/community.zabbix/pull/297).

plugins/modules/zabbix_template.py

@@ -313,6 +313,7 @@
 from distutils.version import LooseVersion
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils._text import to_native
+from ansible.module_utils.six import PY2
 
 from ansible_collections.community.zabbix.plugins.module_utils.base import ZabbixBase
 import ansible_collections.community.zabbix.plugins.module_utils.helpers as zabbix_utils
@@ -469,7 +470,10 @@ def dump_template(self, template_ids, template_type='json', omit_date=False):
                     date = xmlroot.find(".date")
                     if date is not None:
                         xmlroot.remove(date)
-                return str(ET.tostring(xmlroot, encoding='utf-8').decode('utf-8'))
+                if PY2:
+                    return str(ET.tostring(xmlroot, encoding='utf-8'))
+                else:
+                    return str(ET.tostring(xmlroot, encoding='utf-8').decode('utf-8'))
             else:
                 return self.load_json_template(dump, omit_date=omit_date)
 

plugins/modules/zabbix_template_info.py

@@ -149,6 +149,7 @@
 
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils._text import to_native
+from ansible.module_utils.six import PY2
 
 from ansible_collections.community.zabbix.plugins.module_utils.base import ZabbixBase
 import ansible_collections.community.zabbix.plugins.module_utils.helpers as zabbix_utils
@@ -188,7 +189,10 @@ def dump_template(self, template_id, template_type='json', omit_date=False):
                     date = xmlroot.find(".date")
                     if date is not None:
                         xmlroot.remove(date)
-                return str(ET.tostring(xmlroot, encoding='utf-8').decode('utf-8'))
+                if PY2:
+                    return str(ET.tostring(xmlroot, encoding='utf-8'))
+                else:
+                    return str(ET.tostring(xmlroot, encoding='utf-8').decode('utf-8'))
             else:
                 return self.load_json_template(dump, omit_date)
         except Exception as e: