update

Author: g.ph

PyDict.go

@@ -1,11 +1,43 @@
 package py3
 
-import "unsafe"
+import (
+	"github.com/aadog/py3-go/cpy3"
+	"unsafe"
+)
 
 type PyDict struct {
 	PyObject
 }
 
+func (p *PyDict) DelItemString(key string) int {
+	return cpy3.PyDict_DelItemString(p.instance, key)
+}
+
+func (p *PyDict) DelItem(key *PyObject) int {
+	return cpy3.PyDict_DelItem(p.instance, key.instance)
+}
+
+func (p *PyDict) GetItemString(key string) *PyObject {
+	return PyObjectFromInst(cpy3.PyDict_GetItemString(p.instance, key))
+}
+
+func (p *PyDict) Keys(key *PyObject) *PyObject {
+	return PyObjectFromInst(cpy3.PyDict_Keys(p.instance))
+}
+func (p *PyDict) GetItem(key *PyObject) *PyObject {
+	return PyObjectFromInst(cpy3.PyDict_GetItem(p.instance, key.instance))
+}
+
+func (p *PyDict) SetItemString(key string, val *PyObject) int {
+	return cpy3.PyDict_SetItemString(p.instance, key, val.instance)
+}
+func (p *PyDict) Size() int64 {
+	return cpy3.PyDict_Size(p.instance)
+}
+func (p *PyDict) Clear() {
+	cpy3.PyDict_Clear(p.instance)
+}
+
 // PyDictFromInst
 // 新建一个对象来自已经存在的对象实例指针。
 //
@@ -16,3 +48,7 @@ func PyDictFromInst(inst uintptr) *PyDict {
 	dl.ptr = unsafe.Pointer(dl.instance)
 	return dl
 }
+
+func NewPyDict() *PyDict {
+	return PyDictFromInst(cpy3.PyDict_New())
+}

PyModule.go

@@ -88,6 +88,13 @@ func PyModuleFromInst(inst uintptr) *PyModule {
 	return dl
 }
 
+// Create a new object from an existing object instance pointer.
+func PyModuleFromObj(obj *PyObject) *PyModule {
+	dl := new(PyModule)
+	dl.PyObject=*obj
+	return dl
+}
+
 func NewModuleInitFuncCallBack(moduleName string, fn func() *PyObject) uintptr {
 	c := syscall.NewCallback(func() uintptr {
 		return fn().Instance()

cpy3/PyDict.go

@@ -0,0 +1,41 @@
+package cpy3
+
+func PyDict_SetItemString(obj uintptr, key string, val uintptr) int {
+	r, _, _ := pyDict_SetItemString.Call(obj, GoStrToCStr(key), val)
+	return int(r)
+}
+
+func PyDict_New() uintptr {
+	r, _, _ := pyDict_New.Call()
+	return r
+}
+
+func PyDict_Size(obj uintptr) int64 {
+	r, _, _ := pyDict_Size.Call(obj)
+	return int64(r)
+}
+
+func PyDict_Clear(obj uintptr) {
+	pyDict_Clear.Call(obj)
+}
+func PyDict_GetItem(obj uintptr, key uintptr) uintptr {
+	r, _, _ := pyDict_GetItem.Call(obj, key)
+	return r
+}
+func PyDict_Keys(obj uintptr) uintptr {
+	r, _, _ := pyDict_Keys.Call(obj)
+	return r
+}
+func PyDict_GetItemString(obj uintptr, key string) uintptr {
+	r, _, _ := pyDict_GetItemString.Call(obj, GoStrToCStr(key))
+	return r
+}
+
+func PyDict_DelItem(obj uintptr, key uintptr) int {
+	r, _, _ := pyDict_DelItem.Call(obj, key)
+	return int(r)
+}
+func PyDict_DelItemString(obj uintptr, key string) int {
+	r, _, _ := pyDict_DelItemString.Call(obj, GoStrToCStr(key))
+	return int(r)
+}

cpy3/importfuncs.go

@@ -62,6 +62,16 @@ var (
 	pyModule_AddObject         = libpython3.NewProc("PyModule_AddObject")
 	pyModule_AddObjectRef      = libpython3.NewProc("PyModule_AddObjectRef")
 
+	pyDict_SetItemString = libpython3.NewProc("pyDict_SetItemString")
+	pyDict_New           = libpython3.NewProc("PyDict_New")
+	pyDict_Size          = libpython3.NewProc("PyDict_Size")
+	pyDict_Clear         = libpython3.NewProc("PyDict_Clear")
+	pyDict_GetItem       = libpython3.NewProc("PyDict_GetItem")
+	pyDict_Keys          = libpython3.NewProc("PyDict_Keys")
+	pyDict_GetItemString = libpython3.NewProc("PyDict_GetItemString")
+	pyDict_DelItem       = libpython3.NewProc("PyDict_DelItem")
+	pyDict_DelItemString = libpython3.NewProc("PyDict_DelItemString")
+
 	pyEval_GetBuiltins = libpython3.NewProc("PyEval_GetBuiltins")
 	pyEval_GetLocals   = libpython3.NewProc("PyEval_GetLocals")
 	pyEval_GetGlobals  = libpython3.NewProc("PyEval_GetGlobals")