gopy/bind: pass Go strings to Python as Unicode objects

Author: ondra

_examples/cgo/test.py

@@ -7,6 +7,6 @@
 
 import cgo
 
-print("cgo.doc: %r" % (cgo.__doc__,))
-print("cgo.Hi()= %r" % (cgo.Hi(),))
-print("cgo.Hello(you)= %r" % (cgo.Hello("you"),))
+print("cgo.doc: %s" % repr(cgo.__doc__).lstrip('u'))
+print("cgo.Hi()= %s" % repr(cgo.Hi()).lstrip('u'))
+print("cgo.Hello(you)= %s" % repr(cgo.Hello("you")).lstrip('u'))

_examples/empty/test.py

@@ -7,5 +7,5 @@
 
 import empty as pkg
 
-print("doc(pkg):\n%s" % repr(pkg.__doc__))
+print("doc(pkg):\n%s" % repr(pkg.__doc__).lstrip('u'))
 

_examples/named/test.py

@@ -14,9 +14,9 @@
 import named
 
 ### test docs
-print("doc(named): %r" % (named.__doc__,))
-print("doc(named.Float): %r" % (named.Float.__doc__,))
-print("doc(named.Float.Value): %r" % (named.Float.Value.__doc__,))
+print("doc(named): %s" % repr(named.__doc__).lstrip('u'))
+print("doc(named.Float): %s" % repr(named.Float.__doc__).lstrip('u'))
+print("doc(named.Float.Value): %s" % repr(named.Float.Value.__doc__).lstrip('u'))
 
 print("v = named.Float()")
 v = named.Float()
@@ -83,12 +83,12 @@
 print("s = named.Str()")
 s = named.Str()
 print("s = %s" % (s,))
-print("s.Value() = %r" % (s.Value(),))
+print("s.Value() = %s" % repr(s.Value()).lstrip('u'))
 
 print("s = named.Str('string')")
 s = named.Str("string")
 print("s = %s" % (s,))
-print("s.Value() = %r" % (s.Value(),))
+print("s.Value() = %s" % repr(s.Value()).lstrip('u'))
 
 print("arr = named.Array()")
 arr = named.Array()

_examples/seqs/test.py

@@ -13,7 +13,7 @@
 import seqs
 
 ### test docs
-print("doc(seqs): %r" % (seqs.__doc__,))
+print("doc(seqs): %s" % repr(seqs.__doc__).lstrip('u'))
 
 print("arr = seqs.Array(xrange(2))")
 arr = seqs.Array(xrange(2))

_examples/simple/test.py

@@ -7,7 +7,7 @@
 
 import simple as pkg
 
-print("doc(pkg):\n%s" % repr(pkg.__doc__))
+print("doc(pkg):\n%s" % repr(pkg.__doc__).lstrip('u'))
 print("pkg.Func()...")
 pkg.Func()
 print("fct = pkg.Func...")

_examples/structs/test.py

@@ -12,7 +12,7 @@
 print("s = %s" % (s,))
 print("s.Init()")
 s.Init()
-print("s.Upper('boo')= %r" % (s.Upper("boo"),))
+print("s.Upper('boo')= %s" % repr(s.Upper("boo")).lstrip('u'))
 
 print("s1 = structs.S1()")
 s1 = structs.S1()

_examples/unicode/test.py

@@ -7,17 +7,32 @@
 ## py2/py3 compat
 from __future__ import print_function, unicode_literals
 
+import sys
+
 import encoding
 
+# There is no portable way of outputting Unicode in Python 2/3 -- we encode
+# them manually and sidestep the builtin encoding machinery
+try:
+    binary_stdout = sys.stdout.buffer  # Python 3
+except AttributeError:
+    binary_stdout = sys.stdout  # Python 2
+
 bytestr = b"Python byte string"
 unicodestr = u"Python Unicode string 🐱"
 
 bytestr_ret = encoding.HandleString(bytestr)
 unicodestr_ret = encoding.HandleString(unicodestr)
 
-print("encoding.HandleString(bytestr) ->", bytestr_ret)
-print("encoding.HandleString(unicodestr) ->", unicodestr_ret)
+binary_stdout.write(b"encoding.HandleString(bytestr) -> ")
+binary_stdout.write(bytestr_ret.encode('UTF-8'))
+binary_stdout.write(b'\n')
+binary_stdout.write(b"encoding.HandleString(unicodestr) -> ")
+binary_stdout.write(unicodestr_ret.encode('UTF-8'))
+binary_stdout.write(b'\n')
 
 gostring_ret = encoding.GetString()
-print("encoding.GetString() ->", gostring_ret)
+binary_stdout.write(b"encoding.GetString() -> ")
+binary_stdout.write(gostring_ret.encode("UTF-8"))
+binary_stdout.write(b"\n")
 

_examples/vars/test.py

@@ -7,9 +7,9 @@
 
 import vars
 
-print("doc(vars):\n%s" % repr(vars.__doc__))
-print("doc(vars.GetV1()):\n%s" % repr(vars.GetV1.__doc__))
-print("doc(vars.SetV1()):\n%s" % repr(vars.SetV1.__doc__))
+print("doc(vars):\n%s" % repr(vars.__doc__).lstrip('u'))
+print("doc(vars.GetV1()):\n%s" % repr(vars.GetV1.__doc__).lstrip('u'))
+print("doc(vars.SetV1()):\n%s" % repr(vars.SetV1.__doc__).lstrip('u'))
 
 print("Initial values")
 print("v1 = %s" % vars.GetV1())
@@ -48,6 +48,6 @@
 print("k1 = %s" % vars.GetKind1())
 print("k2 = %s" % vars.GetKind2())
 
-print("vars.GetDoc() = %s" % repr(vars.GetDoc()))
-print("doc of vars.GetDoc = %s" % (repr(vars.GetDoc.__doc__),))
-print("doc of vars.SetDoc = %s" % (repr(vars.SetDoc.__doc__),))
+print("vars.GetDoc() = %s" % repr(vars.GetDoc()).lstrip('u'))
+print("doc of vars.GetDoc = %s" % repr(vars.GetDoc.__doc__).lstrip('u'))
+print("doc of vars.SetDoc = %s" % repr(vars.SetDoc.__doc__).lstrip('u'))

bind/gencffi.go

@@ -15,7 +15,8 @@ const (
 	//      #include "%[3]s.h"
 	//       """)
 	// discuss: https://github.com/go-python/gopy/pull/93#discussion_r119652220
-	cffiPreamble = `"""%[1]s"""
+	cffiPreamble = `%[1]s
+from __future__ import unicode_literals
 import collections
 import os
 import sys
@@ -157,17 +158,15 @@ class _cffi_helper(object):
         s = _cffi_helper.lib._cgopy_CString(c)
         pystr = ffi.string(s)
         _cffi_helper.lib._cgopy_FreeCString(s)
-        if _PY3:
-            pystr = pystr.decode('utf8')
+        pystr = pystr.decode('utf8')
         return pystr
 
     @staticmethod
     def cffi_cgopy_cnv_c2py_errstring(c):
         s = _cffi_helper.lib._cgopy_ErrorString(c)
         pystr = ffi.string(s)
         _cffi_helper.lib._cgopy_FreeCString(s)
-        if _PY3:
-            pystr = pystr.decode('utf8')
+        pystr = pystr.decode('utf8')
         return pystr
 
     @staticmethod
@@ -242,7 +241,11 @@ func (g *cffiGen) gen() error {
 func (g *cffiGen) genCffiPreamble() {
 	n := g.pkg.pkg.Name()
 	pkgDoc := g.pkg.doc.Doc
-	g.wrapper.Printf(cffiPreamble, pkgDoc, n)
+	if pkgDoc != "" {
+		g.wrapper.Printf(cffiPreamble, `"""`+pkgDoc+`"""`, n)
+	} else {
+		g.wrapper.Printf(cffiPreamble, "", n)
+	}
 }
 
 func (g *cffiGen) genCffiCdef() {

bind/gencpy.go

@@ -128,7 +128,7 @@ cgopy_cnv_py2c_string(PyObject *o, GoString *addr) {
 static PyObject*
 cgopy_cnv_c2py_string(GoString *addr) {
 	const char *str = _cgopy_CString(*addr);
-	PyObject *pystr = PyString_FromString(str);
+	PyObject *pystr = PyUnicode_FromString(str);
 	free((void*)str);
 	return pystr;
 }
@@ -298,10 +298,16 @@ func (g *cpyGen) gen() error {
 		)
 	}
 
-	g.impl.Printf("module = Py_InitModule3(%[1]q, cpy_%[1]s_methods, %[2]q);\n\n",
-		g.pkg.pkg.Name(),
-		g.pkg.doc.Doc,
-	)
+	if g.pkg.doc.Doc != "" {
+		g.impl.Printf("module = Py_InitModule3(%[1]q, cpy_%[1]s_methods, %[2]q);\n\n",
+			g.pkg.pkg.Name(),
+			g.pkg.doc.Doc,
+		)
+	} else {
+		g.impl.Printf("module = Py_InitModule3(%[1]q, cpy_%[1]s_methods, NULL);\n\n",
+			g.pkg.pkg.Name(),
+		)
+	}
 
 	for _, n := range g.pkg.syms.names() {
 		sym := g.pkg.syms.sym(n)