Fix handling of encoding for xml configs. (#77)

* Use current Zope release versions.
* Actually test with different encoding than default_encoding.

CHANGES.rst

@@ -14,7 +14,10 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Convert input from xml configuration with correct encoding before passing to
+  type_converter.
+  (`#77 <https://github.com/zopefoundation/Products.GenericSetup/pull/77>`_)
+  [sallner]
 
 
 2.0b3 (2018-11-07)

Products/GenericSetup/tests/test_utils.py

@@ -586,6 +586,10 @@ def test__initProperties_normal_iso_8859_1(self):
         helpers = self._makeOne()
         obj = self._getReal(helpers.context)
         node = _getDocumentElement(_NORMAL_PROPERTY_EXPORT_ISO_8859_1)
+        # *sigh* The base class does not respect the encoding specified in the
+        # xml, so we have to be explicit here. In the real world it is in
+        # responsibility of the subclass.
+        helpers._encoding = 'iso-8859-1'
         helpers._initProperties(node)
         self.assertEqual(type(obj.foo_int), int)
         self.assertEqual(type(obj.foo_string), str)

Products/GenericSetup/tool.py

@@ -488,7 +488,7 @@ def markupComparison(self, lines):
             elif line.startswith('-'):
                 result.append(('diff-removed', line))
 
-            elif line == '\ No newline at end of file':
+            elif line == r'\ No newline at end of file':
                 result.append(('diff-context', line))
 
             else:

Products/GenericSetup/utils.py

@@ -806,10 +806,11 @@ def _initProperties(self, node):
                     # The type_converters use the ZPublisher default_encoding
                     # for decoding bytes!
                     if self._encoding.lower() != default_encoding:
-                        u_prop_value = prop_value.decode(self._encoding)
-                        prop_value = u_prop_value.encode(default_encoding)
+                        if isinstance(prop_value, six.binary_type):
+                            u_prop_value = prop_value.decode(self._encoding)
+                            prop_value = u_prop_value.encode(default_encoding)
                         prop_value = type_converters[prop_type](prop_value)
-                        if six.PY2:
+                        if isinstance(prop_value, six.binary_type):
                             u_prop_value = prop_value.decode(default_encoding)
                             prop_value = u_prop_value.encode(self._encoding)
                     else:

buildout.cfg

@@ -1,5 +1,5 @@
 [buildout]
-extends = https://zopefoundation.github.io/Zope/releases/4.0b6/versions-prod.cfg
+extends = https://zopefoundation.github.io/Zope/releases/4.0b7/versions-prod.cfg
 develop = .
 parts =
     test