Support python3.5

Author: nejigane

_test_py2go.py

@@ -27,7 +27,7 @@ def return_unicode():
 
 
 def return_bytearray():
-    return bytearray('abcdefg')
+    return bytearray(b'abcdefg')
 
 
 def return_array():

cgolinks.go

@@ -1,6 +1,6 @@
 package py
 
 /*
-#cgo pkg-config: python-2.7
+#cgo pkg-config: python-3.5
 */
 import "C"

error.go

@@ -13,6 +13,10 @@ void fetchPythonError(PyObject* excInfo)
   PyObject *type, *value, *traceback;
 
   PyErr_Fetch(&type, &value, &traceback);
+  PyErr_NormalizeException(&type, &value, &traceback);
+  if (traceback != NULL) {
+    PyException_SetTraceback(value, traceback);
+  }
   PyTuple_SetItem(excInfo, 0, idOrNone(type));
   PyTuple_SetItem(excInfo, 1, idOrNone(value));
   PyTuple_SetItem(excInfo, 2, idOrNone(traceback));
@@ -44,20 +48,7 @@ func init() {
 		}
 		tracebackFormatExceptionFunc = formatException
 
-		exceptions, err := loadModule("exceptions")
-		if err != nil {
-			ch <- err
-			return
-		}
-		defer exceptions.decRef()
-		syntaxErrorCString := C.CString("SyntaxError")
-		defer C.free(unsafe.Pointer(syntaxErrorCString))
-		syntaxError := C.PyObject_GetAttrString(exceptions.p, syntaxErrorCString)
-		if syntaxError == nil {
-			ch <- errors.New("cannot load exceptions.SyntaxError")
-			return
-		}
-		syntaxErrorType.p = syntaxError
+		syntaxErrorType.p = C.PyExc_SyntaxError
 
 		ch <- nil
 	})
@@ -152,7 +143,7 @@ func getPyErr() error {
 
 func extractLineFromFormattedErrorMessage(formatted Object, n C.Py_ssize_t) string {
 	line := C.PyList_GetItem(formatted.p, n)
-	return C.GoString(C.PyString_AsString(line))
+	return C.GoString(C.PyUnicode_AsUTF8(line))
 }
 
 // pyErr represents an exception of python.

error_test.go

@@ -6,8 +6,8 @@ import (
 )
 
 func TestPyError(t *testing.T) {
-	Convey("When importing exceptions module and extract SyntaxError type", t, func() {
-		mdl, err := LoadModule("exceptions")
+	Convey("When importing builtins module and extract SyntaxError type", t, func() {
+		mdl, err := LoadModule("builtins")
 		So(err, ShouldBeNil)
 		So(mdl, ShouldNotBeNil)
 		Reset(func() {

func_test.go

@@ -105,7 +105,7 @@ func TestPyFunc(t *testing.T) {
 			Convey("it should return an error.", func() {
 				So(err, ShouldNotBeNil)
 				So(ret2.p, ShouldBeNil)
-				So(err.Error(), ShouldContainSubstring, "__call__() takes exactly 2 arguments (1 given)")
+				So(err.Error(), ShouldContainSubstring, "__call__() missing 1 required positional argument")
 			})
 		})
 

go2py_converter.go

@@ -27,7 +27,7 @@ func newPyObj(v data.Value) (Object, error) {
 		pyobj = C.PyBool_FromLong(C.long(b))
 	case data.TypeInt:
 		i, _ := data.AsInt(v)
-		pyobj = C.PyInt_FromLong(C.long(i))
+		pyobj = C.PyLong_FromLong(C.long(i))
 	case data.TypeFloat:
 		f, _ := data.AsFloat(v)
 		pyobj = C.PyFloat_FromDouble(C.double(f))
@@ -37,7 +37,7 @@ func newPyObj(v data.Value) (Object, error) {
 	case data.TypeBlob:
 		b, _ := data.AsBlob(v)
 		cb := (*C.char)(unsafe.Pointer(&b[0]))
-		pyobj = C.PyByteArray_FromStringAndSize(cb, C.Py_ssize_t(len(b)))
+		pyobj = C.PyBytes_FromStringAndSize(cb, C.Py_ssize_t(len(b)))
 	case data.TypeTimestamp:
 		t, _ := data.AsTimestamp(v)
 		pyobj = getPyDateTime(t)
@@ -62,7 +62,7 @@ func newPyObj(v data.Value) (Object, error) {
 func newPyString(s string) *C.PyObject {
 	cs := C.CString(s)
 	defer C.free(unsafe.Pointer(cs))
-	return C.PyString_FromString(cs)
+	return C.PyUnicode_FromString(cs)
 }
 
 func newPyArray(a data.Array) (*C.PyObject, error) {

go2py_converter_test.go

@@ -27,7 +27,7 @@ func TestConvertGo2PyObject(t *testing.T) {
 				"string": argAndExpected{data.String("test"), "test"},
 				"int":    argAndExpected{data.Int(9), "9"},
 				"float":  argAndExpected{data.Float(0.9), "0.9"},
-				"byte":   argAndExpected{data.Blob([]byte("ABC")), "ABC"},
+				"byte":   argAndExpected{data.Blob([]byte("ABC")), "b'ABC'"},
 				"true":   argAndExpected{data.True, "True"},
 				"false":  argAndExpected{data.False, "False"},
 				"null":   argAndExpected{data.Null{}, "None"},

mainthread/init.go

@@ -10,7 +10,7 @@ this package is executed before all other init functions in py package.
 package mainthread
 
 /*
-#cgo pkg-config: python-2.7
+#cgo pkg-config: python-3.5
 #include "Python.h"
 */
 import "C"

module_test.go

@@ -249,7 +249,7 @@ func TestNewInstanceWithKeywordArgument(t *testing.T) {
 
 				actual, err := ins.Call("confirm_init")
 				So(err, ShouldBeNil)
-				So(actual, ShouldEqual, "1_2_{'c': 3, 'd': 4}")
+				So(actual, ShouldBeIn, []string{"1_2_{'c': 3, 'd': 4}", "1_2_{'d': 4, 'c': 3}"})
 			})
 		})
 

py2go_converter.go

@@ -12,8 +12,8 @@ int IsPyTypeFalse(PyObject *o) {
   return o == Py_False;
 }
 
-int IsPyTypeInt(PyObject *o) {
-  return PyInt_CheckExact(o);
+int IsPyTypeLong(PyObject *o) {
+  return PyLong_CheckExact(o);
 }
 
 int IsPyTypeFloat(PyObject *o) {
@@ -24,8 +24,8 @@ int IsPyTypeByteArray(PyObject *o) {
   return PyByteArray_CheckExact(o);
 }
 
-int IsPyTypeString(PyObject *o) {
-  return PyString_CheckExact(o);
+int IsPyTypeBytes(PyObject *o) {
+  return PyBytes_CheckExact(o);
 }
 
 int IsPyTypeList(PyObject *o) {
@@ -76,37 +76,32 @@ func fromPyTypeObject(o *C.PyObject) (data.Value, error) {
 	case C.IsPyTypeFalse(o) > 0:
 		return data.Bool(false), nil
 
-	case C.IsPyTypeInt(o) > 0:
-		return data.Int(C.PyInt_AsLong(o)), nil
+	case C.IsPyTypeLong(o) > 0:
+		return data.Int(C.PyLong_AsLong(o)), nil
 
 	case C.IsPyTypeFloat(o) > 0:
 		return data.Float(C.PyFloat_AsDouble(o)), nil
 
 	case C.IsPyTypeByteArray(o) > 0:
 		bytePtr := C.PyByteArray_FromObject(o)
 		charPtr := C.PyByteArray_AsString(bytePtr)
-		l := C.PyByteArray_Size(o)
-		return data.Blob(C.GoBytes(unsafe.Pointer(charPtr), C.int(l))), nil
+		size := C.int(C.PyByteArray_Size(o))
+		return data.Blob(C.GoBytes(unsafe.Pointer(charPtr), size)), nil
 
-	case C.IsPyTypeString(o) > 0:
-		size := C.int(C.PyString_Size(o))
-		charPtr := C.PyString_AsString(o)
-		return data.String(string(C.GoBytes(unsafe.Pointer(charPtr), size))), nil
+	case C.IsPyTypeBytes(o) > 0:
+		charPtr := C.PyBytes_AsString(o)
+		size := C.int(C.PyBytes_Size(o))
+		return data.Blob(C.GoBytes(unsafe.Pointer(charPtr), size)), nil
 
 	case C.IsPyTypeUnicode(o) > 0:
 		// Use unicode string as UTF-8 in py because
 		// Go's source code is defined to be UTF-8 text and string literal is too.
-		utf8 := C.CString("UTF-8")
-		defer C.free(unsafe.Pointer(utf8))
-
-		strObj := C.PyUnicode_AsEncodedString(o, utf8, nil)
-		if strObj == nil {
+		var size C.Py_ssize_t
+		charPtr := C.PyUnicode_AsUTF8AndSize(o, &size)
+		if charPtr == nil {
 			return data.Null{}, getPyErr()
 		}
-		str := Object{p: strObj}
-		defer str.decRef()
-
-		return fromPyTypeObject(str.p)
+		return data.String(string(C.GoBytes(unsafe.Pointer(charPtr), C.int(size)))), nil
 
 	case isPyTypeDateTime(o):
 		return fromTimestamp(o), nil
@@ -156,7 +151,7 @@ func fromPyMap(o *C.PyObject) (data.Map, error) {
 
 	for C.int(C.PyDict_Next(o, &pos, &key, &value)) > 0 {
 		// data.Map's key is only allowed string or unicode
-		if C.IsPyTypeString(key) == 0 && C.IsPyTypeUnicode(key) == 0 {
+		if C.IsPyTypeBytes(key) == 0 && C.IsPyTypeUnicode(key) == 0 {
 			continue
 		}
 		k, _ := fromPyTypeObject(key)