fixes after merge

Author: Christopher Doris

src/API/exports.jl

@@ -127,6 +127,10 @@ export pyclassmethod
 export pyfunc
 export pyisjl
 export pyjl
+export pyjlcollection
+export pyjlarray
+export pyjldict
+export pyjlset
 export pyjlraw
 export pyjltype
 export pyjlvalue

src/JlWrap/C.jl

@@ -446,9 +446,6 @@ PyJuliaValue_GetValue(o) = Base.GC.@preserve o begin
     end
 end
 
-PyJuliaValue_IsNull(o) =
-    Base.GC.@preserve o UnsafePtr{PyJuliaValueObject}(C.asptr(o)).value[] == 0
-
 PyJuliaValue_SetValue(o, v::Union{Nothing,Bool}) = Base.GC.@preserve o begin
     optr = UnsafePtr{PyJuliaValueObject}(C.asptr(o))
     idx = optr.value[]

src/JlWrap/any.jl

@@ -585,6 +585,5 @@ end
 Create a Python `juliacall.Jl` object wrapping the Julia object `x`.
 """
 pyjl(v) = pyjl(pyjlanytype, v)
-export pyjl
 
 pyjliter(x) = pyjl(pyjlitertype, x)

src/JlWrap/array.jl

@@ -390,6 +390,5 @@ This object can be converted to a Numpy array with `numpy.array(v)`, `v.to_numpy
 If `x` is one-dimensional (an `AbstractVector`) then it also behaves as a `list`.
 """
 pyjlarray(x::AbstractArray) = pyjl(pyjlarraytype, x)
-export pyjlarray
 
 Py(x::AbstractArray) = pyjlarray(x)

src/JlWrap/collection.jl

@@ -2,39 +2,47 @@ const pyjlcollectiontype = pynew()
 
 pyjlcollection_clear(x) = (empty!(x); Py(nothing))
 
-pyjlcollection_contains(x, v::Py) = pybool(in(@pyconvert(eltype(x), v, (return Py(false))), x)::Bool)
+pyjlcollection_contains(x, v::Py) =
+    pybool(in(@pyconvert(eltype(x), v, (return Py(false))), x)::Bool)
 
 pyjlcollection_eq(self, other) = pybool((self == pyjlvalue(other))::Bool)
 
 function init_collection()
     jl = pyjuliacallmodule
-    pybuiltins.exec(pybuiltins.compile("""
-    $("\n"^(@__LINE__()-1))
-    class JlCollection(JlBase2):
-        __slots__ = ()
-        def __len__(self):
-            return self._jl_callmethod($(pyjl_methodnum(pyint ∘ length)))
-        def __bool__(self):
-            return self._jl_callmethod($(pyjl_methodnum(pybool ∘ !isempty)))
-        def __iter__(self):
-            return self._jl_callmethod($(pyjl_methodnum(pyjliter ∘ Iterator)))
-        def __hash__(self):
-            return self._jl_callmethod($(pyjl_methodnum(pyjlany_hash)))
-        def __eq__(self, other):
-            if isinstance(self, type(other)) or isinstance(other, type(self)):
-                return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_eq)), other)
-            else:
-                return NotImplemented
-        def __contains__(self, v):
-            return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_contains)), v)
-        def copy(self):
-            return self._jl_callmethod($(pyjl_methodnum(pyjlcollection ∘ copy)))
-        def clear(self):
-            return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_clear)))
-    import collections.abc
-    collections.abc.Collection.register(JlCollection)
-    del collections
-    """, @__FILE__(), "exec"), jl.__dict__)
+    pybuiltins.exec(
+        pybuiltins.compile(
+            """
+$("\n"^(@__LINE__()-1))
+class JlCollection(JlBase2):
+    __slots__ = ()
+    def __len__(self):
+        return self._jl_callmethod($(pyjl_methodnum(pyint ∘ length)))
+    def __bool__(self):
+        return self._jl_callmethod($(pyjl_methodnum(pybool ∘ !isempty)))
+    def __iter__(self):
+        return self._jl_callmethod($(pyjl_methodnum(pyjliter ∘ Iterator)))
+    def __hash__(self):
+        return self._jl_callmethod($(pyjl_methodnum(pyjlany_hash)))
+    def __eq__(self, other):
+        if isinstance(self, type(other)) or isinstance(other, type(self)):
+            return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_eq)), other)
+        else:
+            return NotImplemented
+    def __contains__(self, v):
+        return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_contains)), v)
+    def copy(self):
+        return self._jl_callmethod($(pyjl_methodnum(pyjlcollection ∘ copy)))
+    def clear(self):
+        return self._jl_callmethod($(pyjl_methodnum(pyjlcollection_clear)))
+import collections.abc
+collections.abc.Collection.register(JlCollection)
+del collections
+""",
+            @__FILE__(),
+            "exec",
+        ),
+        jl.__dict__,
+    )
     pycopy!(pyjlcollectiontype, jl.JlCollection)
 end
 
@@ -51,7 +59,6 @@ pyjlcollection(x) = pyjl(pyjlcollectiontype, x)
 pyjlcollection(x::AbstractSet) = pyjlset(x)
 pyjlcollection(x::AbstractArray) = pyjlarray(x)
 pyjlcollection(x::AbstractDict) = pyjldict(x)
-export pyjlcollection
 
 Py(x::Base.ValueIterator) = pyjlcollection(x)
 Py(x::Base.RefValue) = pyjlcollection(x)

src/JlWrap/dict.jl

@@ -118,6 +118,5 @@ end
 Wrap `x` as a Python `dict`-like object.
 """
 pyjldict(x::AbstractDict) = pyjl(pyjldicttype, x)
-export pyjldict
 
 Py(x::AbstractDict) = pyjldict(x)

src/JlWrap/set.jl

@@ -130,6 +130,5 @@ end
 Wrap `x` as a Python `set`-like object.
 """
 pyjlset(x::AbstractSet) = pyjl(pyjlsettype, x)
-export pyjlset
 
 Py(x::AbstractSet) = pyjlset(x)