better handling of 18n text

we were not decoding doc strings correctly from utf-8 in python2.7

Author: jcupitt

CHANGELOG.rst

@@ -9,6 +9,7 @@
 * add some libvips 8.7 tests
 * move to pytest [kleis]
 * better handling of many-byte values in py3 new_from_memory [MatthiasKohl]
+* better handling of utf-8 i18n text [felixbuenemann]
 
 ## Version 2.1.2 (1 March 2018)
 

pyvips/error.py

@@ -22,7 +22,6 @@ def _to_bytes(x):
     call this on strings you pass to libvips.
 
     """
-
     if isinstance(x, text_type):
         x = x.encode()
     return x
@@ -35,8 +34,11 @@ def _to_string(x):
     string. You must call this on text strings you get back from libvips.
 
     """
-    if _is_PY3 and isinstance(x, bytes):
-        x = x.decode('utf-8')
+    if isinstance(x, bytes):
+        if _is_PY3:
+            x = x.decode('utf-8')
+        else:
+            x = unicode(x, 'utf-8')
     return x
 
 

pyvips/voperation.py

@@ -292,7 +292,7 @@ def generate_docstring(operation_name):
         result += ")\n"
 
         def argstr(name):
-            return ('    {0} ({1}): {2}\n'.
+            return (u'    {0} ({1}): {2}\n'.
                     format(name,
                            GValue.gtype_to_python(op.get_typeof(name)),
                            op.get_blurb(name)))