use the new module names

Author: Christopher Doris

pysrc/juliacall/__init__.py

@@ -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/ipython.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""")

src/JlWrap/C.jl

@@ -1,7 +1,7 @@
 module Cjl
 
-using ..._CPython: _CPython as C
-using ..._Utils: _Utils as Utils
+using ...C: C
+using ...Utils: Utils
 using Base: @kwdef
 using UnsafePointers: UnsafePtr
 using Serialization: serialize, deserialize

src/JlWrap/JlWrap.jl

@@ -8,7 +8,7 @@ module JlWrap
 using ..PythonCall: PythonCall
 using ..Core
 using ..Core: C, Utils, pynew, @autopy, incref, decref, setptr!, getptr, pyjuliacallmodule, pycopy!, errcheck, errset, PyNULL, pyistuple, pyisnull, pyJuliaError, pydel!, pyistype, pytypecheck, pythrow, pytuple_getitem, pyisslice, pystr_asstring, pyosmodule, pyisstr
-using .._pyconvert: pyconvert, @pyconvert, PYCONVERT_PRIORITY_WRAP, pyconvert_add_rule, pyconvert_tryconvert, pyconvertarg, pyconvert_result
+using ..Convert: pyconvert, @pyconvert, PYCONVERT_PRIORITY_WRAP, pyconvert_add_rule, pyconvert_tryconvert, pyconvertarg, pyconvert_result
 
 using Pkg: Pkg
 using Base: @propagate_inbounds, allocatedinline
@@ -48,7 +48,7 @@ function __init__()
         init_callback()
         # add packages to juliacall
         jl = pyjuliacallmodule
-        jl.Core = Core
+        jl.Core = Base.Core
         jl.Base = Base
         jl.Main = Main
         jl.Pkg = Pkg

src/PyMacro/PyMacro.jl

@@ -149,7 +149,7 @@ py_macro_assign(body, ans, ex) = push!(body, :($ans = $ex))
 
 py_macro_del(body, var, tmp) = if tmp; push!(body, :($pydel!($var))); end
 
-ismacroexpr(ex, name) = isexpr(ex, :macrocall) && (ex.args[1] === Symbol(name) || ex.args[1] === GlobalRef(Core, Symbol(name)))
+ismacroexpr(ex, name) = isexpr(ex, :macrocall) && (ex.args[1] === Symbol(name) || ex.args[1] === GlobalRef(Base.Core, Symbol(name)))
 
 function py_macro_lower(st, body, ans, ex; flavour=:expr)
 

src/PythonCall.jl

@@ -14,7 +14,7 @@ include("JlWrap/JlWrap.jl")
 include("Compat/Compat.jl")
 
 # re-export everything
-for m in [:_Py, :_pyconvert, :_pymacro, :_pywrap, :_jlwrap, :_compat]
+for m in [:Core, :Convert, :PyMacro, :Wrap, :JlWrap, :Compat]
     for k in names(@eval($m))
         if k != m
             @eval using .$m: $k
@@ -24,19 +24,19 @@ for m in [:_Py, :_pyconvert, :_pymacro, :_pywrap, :_jlwrap, :_compat]
 end
 
 # non-exported API
-for k in [:C, :GC, :pynew, :pyisnull, :pycopy!, :getptr, :pydel!, :unsafe_pynext, :PyNULL, :CONFIG]
-    @eval const $k = _Py.$k
+for k in [:pynew, :pyisnull, :pycopy!, :getptr, :pydel!, :unsafe_pynext, :PyNULL, :CONFIG]
+    @eval const $k = Core.$k
 end
 for k in [:pyconvert_add_rule, :pyconvert_return, :pyconvert_unconverted, :PYCONVERT_PRIORITY_WRAP, :PYCONVERT_PRIORITY_ARRAY, :PYCONVERT_PRIORITY_CANONICAL, :PYCONVERT_PRIORITY_NORMAL, :PYCONVERT_PRIORITY_FALLBACK]
-    @eval const $k = _pyconvert.$k
+    @eval const $k = Convert.$k
 end
 for k in [:event_loop_on, :event_loop_off, :fix_qt_plugin_path]
-    @eval const $k = _compat.$k
+    @eval const $k = Compat.$k
 end
 
 # not API but used in tests
 for k in [:pyjlanytype, :pyjlarraytype, :pyjlvectortype, :pyjlbinaryiotype, :pyjltextiotype, :pyjldicttype, :pyjlmoduletype, :pyjlintegertype, :pyjlrationaltype, :pyjlrealtype, :pyjlcomplextype, :pyjlsettype, :pyjltypetype]
-    @eval const $k = _jlwrap.$k
+    @eval const $k = JlWrap.$k
 end
 
 end

test/Compat.jl

@@ -21,7 +21,7 @@ end
         pystdout = sys.stdout
         fp = sys.stdout = io.StringIO()
         try
-            d = PythonCall._compat.PythonDisplay()
+            d = PythonCall.Compat.PythonDisplay()
             @test display(d, 123) === nothing
             fp.seek(0)
             @test pyconvert(String, fp.read()) == "123\n"

test/Utils.jl

@@ -1,11 +1,11 @@
 @testitem "mimes_for" begin
     for x in Any[1, "foo", [], 'z']
-        @test PythonCall._Utils.mimes_for(x) isa Vector{String}
+        @test PythonCall.Utils.mimes_for(x) isa Vector{String}
     end
 end
 
 @testitem "StaticString length and indexing" begin
-    s = PythonCall._Utils.StaticString{UInt32, 44}("ababababb")
+    s = PythonCall.Utils.StaticString{UInt32, 44}("ababababb")
     @test length(s) == 9
     @test s[1] == 'a'
     @test s[1:2] == "ab"