fix PyDict_Next, C function actually returns bool

masci · sbinet · commit 6d13f941744b · 2017-09-01T21:34:05.000+02:00
diff --git a/dict.go b/dict.go
@@ -4,7 +4,6 @@ package python
 import "C"
 
 import (
-	"errors"
 	"unsafe"
 )
 
@@ -160,9 +159,9 @@ func PyDict_Size(self *PyObject) int {
 //     Py_DECREF(o);
 // }
 // Changed in version 2.5: This function used an int * type for ppos. This might require changes in your code for properly supporting 64-bit systems.
-func PyDict_Next(self *PyObject, pos *int, key, value **PyObject) error {
+func PyDict_Next(self *PyObject, pos *int, key, value **PyObject) bool {
 	if pos == nil {
-		return errors.New("invalid position")
+		return false
 	}
 
 	c_pos := C.Py_ssize_t(*pos)
@@ -175,7 +174,7 @@ func PyDict_Next(self *PyObject, pos *int, key, value **PyObject) error {
 	*key = togo(c_key)
 	*value = togo(c_val)
 
-	return int2err(err)
+	return int2bool(err)
 }
 
 // int PyDict_Merge(PyObject *a, PyObject *b, int override)
diff --git a/object.go b/object.go
@@ -83,7 +83,7 @@ func int2err(i C.int) error {
 		return nil
 	}
 	//FIXME: also handle python exceptions ?
-	return &gopy_err{fmt.Sprintf("error in C-Python (rc=%i)", int(i))}
+	return &gopy_err{fmt.Sprintf("error in C-Python (rc=%d)", int(i))}
 }
 
 func file2go(f *C.FILE) *os.File {

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func int2err(i C.int) error {`
`83`	`83`	`return nil`
`84`	`84`	`}`
`85`	`85`	`//FIXME: also handle python exceptions ?`
`86`		`- return &gopy_err{fmt.Sprintf("error in C-Python (rc=%i)", int(i))}`
	`86`	`+ return &gopy_err{fmt.Sprintf("error in C-Python (rc=%d)", int(i))}`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`func file2go(f C.FILE) os.File {`