get Core working

Author: Christopher Doris

src/API/API.jl

@@ -20,6 +20,7 @@ function pycopy! end
 function getptr end
 function pydel! end
 function unsafe_pynext end
+function pyconvert end
 function pyconvert_add_rule end
 function pyconvert_return end
 function pyconvert_unconverted end
@@ -222,6 +223,7 @@ export pycallable
 export pycompile
 export pybuiltins
 export @pyconst
+export pyconvert
 
 # public bindings
 if Base.VERSION ≥ v"1.11"

src/Core/Core.jl

@@ -1,14 +1,6 @@
-"""
-    module PythonCall.Core
-
-Defines the `Py` type and directly related functions.
-"""
 module Core
 
-const VERSION = v"0.9.23"
-const ROOT_DIR = dirname(dirname(@__DIR__))
-
-using ..PythonCall: PythonCall  # needed for docstring cross-refs
+using ..PythonCall
 using ..C: C
 using ..GC: GC
 using ..Utils: Utils
@@ -26,12 +18,120 @@ using Dates:
     millisecond,
     microsecond,
     nanosecond
-using MacroTools: MacroTools, @capture
+using MacroTools: @capture
 using Markdown: Markdown
 
+import PythonCall:
+    VERSION,
+    Py,
+    PyException,
+    ispy,
+    pyis,
+    pyrepr,
+    pyascii,
+    pyhasattr,
+    pygetattr,
+    pysetattr,
+    pydelattr,
+    pyissubclass,
+    pyisinstance,
+    pyhash,
+    pytruth,
+    pynot,
+    pylen,
+    pyhasitem,
+    pygetitem,
+    pysetitem,
+    pydelitem,
+    pydir,
+    pycall,
+    pyeq,
+    pyne,
+    pyle,
+    pylt,
+    pyge,
+    pygt,
+    pycontains,
+    pyin,
+    pyneg,
+    pypos,
+    pyabs,
+    pyinv,
+    pyindex,
+    pyadd,
+    pysub,
+    pymul,
+    pymatmul,
+    pyfloordiv,
+    pytruediv,
+    pymod,
+    pydivmod,
+    pylshift,
+    pyrshift,
+    pyand,
+    pyxor,
+    pyor,
+    pyiadd,
+    pyisub,
+    pyimul,
+    pyimatmul,
+    pyifloordiv,
+    pyitruediv,
+    pyimod,
+    pyilshift,
+    pyirshift,
+    pyiand,
+    pyixor,
+    pyior,
+    pypow,
+    pyipow,
+    pyiter,
+    pynext,
+    pybool,
+    pystr,
+    pybytes,
+    pyint,
+    pyfloat,
+    pycomplex,
+    pytype,
+    pyslice,
+    pyrange,
+    pytuple,
+    pylist,
+    pycollist,
+    pyrowlist,
+    pyset,
+    pyfrozenset,
+    pydict,
+    pydate,
+    pytime,
+    pydatetime,
+    pyfraction,
+    pyeval,
+    pyexec,
+    @pyeval,
+    @pyexec,
+    pywith,
+    pyimport,
+    pyprint,
+    pyhelp,
+    pyall,
+    pyany,
+    pycallable,
+    pycompile,
+    @pyconst,
+    pyconvert,
+    pynew,
+    pyisnull,
+    pycopy!,
+    getptr,
+    pydel!,
+    unsafe_pynext
+
+const ROOT_DIR = dirname(dirname(@__DIR__))
+
 include("Py.jl")
 include("err.jl")
-include("config.jl")
 include("consts.jl")
 include("builtins.jl")
 include("stdlib.jl")

src/Core/Py.jl

@@ -9,7 +9,6 @@ True if `x` is a Python object.
 This includes `Py` and Python wrapper types such as `PyList`.
 """
 ispy(x) = false
-export ispy
 
 """
     pyisnull(x)
@@ -28,10 +27,10 @@ getptr(x) = ispy(x) ? getptr(Py(x)::Py) : throw(MethodError(getptr, (x,)))
 py_finalizer(x::Py) = GC.enqueue(getptr(x))
 
 ispy(::Py) = true
-getptr(x::Py) = getfield(x, :ptr)
+getptr(x::Py) = C.PyPtr(getfield(x, :ptr))
 pyconvert(::Type{Py}, x::Py) = x
 
-setptr!(x::Py, ptr::C.PyPtr) = (setfield!(x, :ptr, ptr); x)
+setptr!(x::Py, ptr::C.PyPtr) = (setfield!(x, :ptr, Ptr{Cvoid}(ptr)); x)
 
 const PYNULL_CACHE = Py[]