From 5167a7b23e1d6ac26f3529a48ae01b9ffb62e1ed Mon Sep 17 00:00:00 2001
From: Sebastien Binet <binet@cern.ch>
Date: Thu, 26 Mar 2020 15:22:31 +0100
Subject: [PATCH] capi: prevent from directly wrapping Go functions

Fixes #102.
---
 capi.go | 4 +++-
 heap.go | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/capi.go b/capi.go
index 2d8d777..deec35f 100644
--- a/capi.go
+++ b/capi.go
@@ -16,11 +16,13 @@ func Py_BuildValue(format string, args ...interface{}) *PyObject {
 // ml_doc	char *	points to the contents of the docstring
 type PyMethodDef struct {
 	Name  string // name of the method
-	Meth  func(self, args *PyObject) *PyObject
+	Meth  PyCFunction
 	Flags MethodDefFlags
 	Doc   string
 }
 
+type PyCFunction C.PyCFunction
+
 type MethodDefFlags int
 
 const (
diff --git a/heap.go b/heap.go
index d3a00a1..d5f0c27 100644
--- a/heap.go
+++ b/heap.go
@@ -24,7 +24,7 @@ func cpyMethodDefs(name string, methods []PyMethodDef) *C.PyMethodDef {
 	for i, meth := range methods {
 		cmeth := C.PyMethodDef{
 			ml_name:  C.CString(meth.Name),
-			ml_meth:  (C.PyCFunction)(unsafe.Pointer(&meth.Meth)),
+			ml_meth:  C.PyCFunction(meth.Meth),
 			ml_flags: C.int(meth.Flags),
 			ml_doc:   C.CString(meth.Doc),
 		}
@@ -43,6 +43,7 @@ func Py_InitModule(name string, methods []PyMethodDef) (*PyObject, error) {
 
 	obj := togo(C._gopy_InitModule(c_mname, cmeths))
 	if obj == nil {
+		PyErr_Print()
 		return nil, errors.New("python: internal error; module creation failed.")
 	}
 	return obj, nil
@@ -59,6 +60,7 @@ func Py_InitModule3(name string, methods []PyMethodDef, doc string) (*PyObject,
 
 	obj := togo(C._gopy_InitModule3(cname, cmeths, cdoc))
 	if obj == nil {
+		PyErr_Print()
 		return nil, errors.New("python: internal error; module creation failed.")
 	}
 	return obj, nil