Merge branch 'main' into v1

Author: Christopher Doris

docs/src/pycall.md

@@ -24,9 +24,9 @@ def convert(T, x):
 def interactive(enable=True):
     "Allow the Julia event loop to run in the background of the Python REPL."
     if enable:
-        PythonCall._set_python_input_hook()
+        PythonCall.Compat._set_python_input_hook()
     else:
-        PythonCall._unset_python_input_hook()
+        PythonCall.Compat._unset_python_input_hook()
 
 class JuliaError(Exception):
     "An error arising in Julia code."

pysrc/juliacall/__init__.py

@@ -95,7 +95,7 @@ def load_ipython_extension(ip):
     ip.events.register('post_execute', PythonCall._ipython._flush_stdio)
     # push displays
     PythonCall.seval("""begin
-        pushdisplay(_compat.PythonDisplay())
-        pushdisplay(_compat.IPythonDisplay())
+        pushdisplay(Compat.PythonDisplay())
+        pushdisplay(Compat.IPythonDisplay())
         nothing
     end""")

pysrc/juliacall/ipython.py

@@ -1,9 +1,9 @@
 """
-    module _CPython
+    module PythonCall.C
 
 This module provides a direct interface to the Python C API.
 """
-module _CPython
+module C
 
 using Base: @kwdef
 using UnsafePointers: UnsafePtr
@@ -12,16 +12,12 @@ using Pkg: Pkg
 using Requires: @require
 using Libdl: dlpath, dlopen, dlopen_e, dlclose, dlsym, dlsym_e, RTLD_LAZY, RTLD_DEEPBIND, RTLD_GLOBAL
 
-# import Base: @kwdef
-# import CondaPkg
-# import Pkg
-# using Libdl, Requires, UnsafePointers, Serialization, ..Utils
-
 include("consts.jl")
 include("pointers.jl")
 include("extras.jl")
 include("context.jl")
 include("gil.jl")
+include("api.jl")
 
 function __init__()
     init_context()

src/CPython/_.jl src/C/C.jlsrc/CPython/_.jl renamed to src/C/C.jl

@@ -0,0 +1,27 @@
+"""
+    python_executable_path()
+
+Path to the Python interpreter, or `missing` if not known.
+"""
+python_executable_path() = CTX.exe_path
+
+"""
+    python_library_path()
+
+Path to libpython, or `missing` if not known.
+"""
+python_library_path() = CTX.lib_path
+
+"""
+    python_library_handle()
+
+Handle to the open libpython, or `C_NULL` if not known.
+"""
+python_library_handle() = CTX.lib_ptr
+
+"""
+    python_version()
+
+The version of Python, or `missing` if not known.
+"""
+python_version() = CTX.version