rename modules

Author: Christopher Doris

src/C/C.jl

@@ -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,11 +12,6 @@ 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")

src/Compat/Compat.jl

@@ -1,14 +1,14 @@
 """
-    module _compat
+    module PythonCall.Compat
 
 Misc bits and bobs for compatibility.
 """
-module _compat
+module Compat
     using ..PythonCall: PythonCall  # needed for docstring cross-refs
-    using .._Py
-    using .._Py: C, Utils, pynew, incref, getptr, pycopy!, pymodulehooks, pyisnull, pybytes_asvector, pysysmodule, pyosmodule, pystr_fromUTF8
-    using .._pyconvert: pyconvert, @pyconvert
-    using .._pywrap: PyPandasDataFrame
+    using ..Core
+    using ..Core: C, Utils, pynew, incref, getptr, pycopy!, pymodulehooks, pyisnull, pybytes_asvector, pysysmodule, pyosmodule, pystr_fromUTF8
+    using ..Convert: pyconvert, @pyconvert
+    using ..Wrap: PyPandasDataFrame
     using Serialization: Serialization, AbstractSerializer, serialize, deserialize
     using Tables: Tables
     using Requires: @require

src/Convert/Convert.jl

@@ -0,0 +1,29 @@
+"""
+    module PythonCall.Convert
+
+Implements `pyconvert`.
+"""
+module Convert
+
+using ..Core
+using ..Core: C, Utils, @autopy, getptr, incref, pynew, PyNULL, pyisnull, pydel!, pyisint, iserrset_ambig, pyisnone, pyisTrue, pyisFalse, pyfloat_asdouble, pycomplex_ascomplex, pyisstr, pystr_asstring, pyisbytes, pybytes_asvector, pybytes_asUTF8string, pyisfloat, pyisrange, pytuple_getitem, unsafe_pynext, pyistuple, pydatetimetype, pytime_isaware, pydatetime_isaware, _base_pydatetime, _base_datetime, errmatches, errclear, errset, pyiscomplex, pythrow, pybool_asbool
+using Dates: Date, Time, DateTime, Millisecond
+
+import ..Core: pyconvert
+
+include("pyconvert.jl")
+include("rules.jl")
+include("ctypes.jl")
+include("numpy.jl")
+include("pandas.jl")
+
+function __init__()
+    C.with_gil() do 
+        init_pyconvert()
+        init_ctypes()
+        init_numpy()
+        init_pandas()
+    end
+end
+
+end

src/PyConvert/ctypes.jl src/Convert/ctypes.jlsrc/PyConvert/ctypes.jl renamed to src/Convert/ctypes.jl

@@ -1,23 +1,22 @@
 """
-    module _Py
+    module PythonCall.Core
 
 Defines the `Py` type and directly related functions.
 """
-module _Py
+module Core
 
 const VERSION = v"0.9.15"
 const ROOT_DIR = dirname(dirname(@__DIR__))
 
 using ..PythonCall: PythonCall  # needed for docstring cross-refs
-using .._CPython: _CPython as C
-using .._Utils: _Utils as Utils
+using ..C: C
+using ..GC: GC
+using ..Utils: Utils
 using Base: @propagate_inbounds, @kwdef
 using Dates: Date, Time, DateTime, year, month, day, hour, minute, second, millisecond, microsecond, nanosecond
 using MacroTools: @capture
 using Markdown: Markdown
-# using MacroTools, Dates, Tables, Markdown, Serialization, Requires, Pkg, REPL
 
-include("gc.jl")
 include("Py.jl")
 include("err.jl")
 include("config.jl")

src/PyConvert/numpy.jl src/Convert/numpy.jlsrc/PyConvert/numpy.jl renamed to src/Convert/numpy.jl

@@ -1,11 +1,13 @@
 """
+    module PythonCall.GC
+
 Garbage collection of Python objects.
 
 See `disable` and `enable`.
 """
 module GC
 
-using .._Py: C
+using ..C: C
 
 const ENABLED = Ref(true)
 const QUEUE = C.PyPtr[]