Skip to content

Commit 98aa589

Browse files
author
Christopher Doris
committed
remove lingering references to _Py
1 parent 7129a0d commit 98aa589

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

src/Compat/Compat.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Misc bits and bobs for compatibility.
66
module Compat
77
using ..PythonCall: PythonCall # needed for docstring cross-refs
88
using ..Core
9-
using ..Core: C, Utils, pynew, incref, getptr, pycopy!, pymodulehooks, pyisnull, pybytes_asvector, pysysmodule, pyosmodule, pystr_fromUTF8
9+
using ..Core: Core, C, Utils, pynew, incref, getptr, pycopy!, pymodulehooks, pyisnull, pybytes_asvector, pysysmodule, pyosmodule, pystr_fromUTF8
1010
using ..Convert: pyconvert, @pyconvert
1111
using ..Wrap: PyArray, PyPandasDataFrame
1212
using Serialization: Serialization, AbstractSerializer, serialize, deserialize

src/Compat/gui.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ function init_gui()
130130
pycopy!(new_event_loop_callback, g["new_event_loop_callback"])
131131

132132
# add a hook to automatically call fix_qt_plugin_path()
133-
fixqthook = Py(() -> (_Py.CONFIG.auto_fix_qt_plugin_path && fix_qt_plugin_path(); nothing))
133+
fixqthook = Py(() -> (Core.CONFIG.auto_fix_qt_plugin_path && fix_qt_plugin_path(); nothing))
134134
pymodulehooks.add_hook("PyQt4", fixqthook)
135135
pymodulehooks.add_hook("PyQt5", fixqthook)
136136
pymodulehooks.add_hook("PySide", fixqthook)

src/Compat/pycall.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function init_pycall(PyCall::Module)
1010
- Set the environment variable `PYTHON` to `PythonCall.C.CTX.exe_path` and rebuild PyCall. This forces PyCall
1111
to use the same interpreter as PythonCall, but needs to be repeated whenever you switch Julia environment.
1212
"""
13-
@eval function _Py.Py(x::$PyCall.PyObject)
13+
@eval function Core.Py(x::$PyCall.PyObject)
1414
C.CTX.matches_pycall::Bool || error($errmsg)
1515
return pynew(C.PyPtr($PyCall.pyreturn(x)))
1616
end

src/JlWrap/JlWrap.jl

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ using ..PythonCall: PythonCall
99
using ..Core
1010
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
1111
using ..Convert: pyconvert, @pyconvert, PYCONVERT_PRIORITY_WRAP, pyconvert_add_rule, pyconvert_tryconvert, pyconvertarg, pyconvert_result
12+
using ..GC: GC
1213

1314
using Pkg: Pkg
1415
using Base: @propagate_inbounds, allocatedinline

src/JlWrap/objectarray.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PyObjectArray(undef::UndefInitializer, dims::Vararg{Integer,N}) where {N} = PyOb
2323
PyObjectArray{N}(x::AbstractArray{T,N}) where {T,N} = copyto!(PyObjectArray{N}(undef, size(x)), x)
2424
PyObjectArray(x::AbstractArray{T,N}) where {T,N} = PyObjectArray{N}(x)
2525

26-
pyobjectarray_finalizer(x::PyObjectArray) = _Py.GC.enqueue_all(x.ptrs)
26+
pyobjectarray_finalizer(x::PyObjectArray) = GC.enqueue_all(x.ptrs)
2727

2828
Base.IndexStyle(x::PyObjectArray) = Base.IndexStyle(x.ptrs)
2929

0 commit comments

Comments
 (0)