Formulator: repair FormToXML for py2

In 1b555dbf (py2/py3: Make Products code compatible with both python2
and python3 (!1751)., 2024-07-16) we changed the code in a
way that on python2 it would first node text to a python2 str and only
later convert it to unicode, but setting text to a str during the first
step can fail with:

    ValueError: All strings must be XML compatible: Unicode or ASCII, no NULL bytes or control characters

This change to set directly unicode on py2.

product/Formulator/FormToXML.py

@@ -21,9 +21,7 @@ def formToXML(form, prologue=1):
         else:
           value = 'false'
       sub_element = SubElement(form_as_xml, id)
-      sub_element.text = str(value)
-      if six.PY2:
-        sub_element.text = str2unicode(sub_element.text, encoding)
+      sub_element.text = str2unicode(str(value), encoding)
     groups = SubElement(form_as_xml, 'groups')
     # export form groups
     for group in form.get_groups(include_empty=1):
@@ -59,24 +57,19 @@ def formToXML(form, prologue=1):
             if not isinstance(value, six.string_types):
               value = str(value)
             value_element = SubElement(values_element, key)
-          value_element.text = str(value)
-          if six.PY2:
-            value_element.text = str2unicode(value_element.text, encoding)
+          value_element.text = str2unicode(str(value), encoding)
 
         tales_element = SubElement(field_element, 'tales')
         items = sorted(field.tales.items())
         for key, value in items:
           if value:
             tale_element = SubElement(tales_element, key)
-            tale_element.text = str(value._text)
-            if six.PY2:
-              tale_element.text = str2unicode(tale_element.text, encoding)
+            tale_element.text = str2unicode(str(value._text), encoding)
+
         messages = SubElement(field_element, 'messages')
         for message_key in field.get_error_names():
           message_element = SubElement(messages, 'message', name=message_key)
-          message_element.text = field.get_error_message(message_key)
-          if six.PY2:
-            message_element.text = str2unicode(message_element.text, encoding)
+          message_element.text = str2unicode(field.get_error_message(message_key), encoding)
         # Special attribute for ProxyFields *delegated_list*
         delegated_list = getattr(field, 'delegated_list', [])
         if delegated_list: