tweak pyjl

Author: Christopher Doris

docs/src/conversion-to-python.md

@@ -43,6 +43,14 @@ PythonCall.getpy
 PythonCall.ispy
 ```
 
+Alternatively, if you define a wrapper type (a subtype of
+[`juliacall.AnyValue`](#juliacall.AnyValue)) then you may instead define `pyjltype(::T)` to
+be that type.
+
+```@docs
+PythonCall.pyjltype
+```
+
 ## [Wrapper types](@id julia-wrappers)
 
 Apart from a few fundamental immutable types, all Julia values are by default converted into Python to some [`AnyValue`](#juliacall.AnyValue) object, which wraps the original value, but giving it a Pythonic interface.

src/jlwrap/any.jl

@@ -301,7 +301,7 @@ function init_jlwrap_any()
 end
 
 """
-    pyjl([t], x)
+    pyjl([t=pyjltype(x)], x)
 
 Create a Python object wrapping the Julia object `x`.
 
@@ -311,5 +311,18 @@ Its Python type is normally inferred from the type of `x`, but can be specified
 
 For example if `x` is an `AbstractVector` then the object will have type `juliacall.VectorValue`.
 This object will satisfy the Python sequence interface, so for example uses 0-up indexing.
+
+To define a custom conversion for your type `T`, overload `pyjltype(::T)`.
+"""
+pyjl(v) = pyjl(pyjltype(v), v)
+export pyjl
+
+"""
+    pyjltype(x)
+
+The subtype of `juliacall.AnyValue` which the Julia object `x` is wrapped as by `pyjl(x)`.
+
+Overload `pyjltype(::T)` to define a custom conversion for your type `T`.
 """
-pyjl(v) = pyjl(pyjlanytype, v)
+pyjltype(::Any) = pyjlanytype
+export pyjltype

src/jlwrap/array.jl

@@ -334,4 +334,4 @@ function init_jlwrap_array()
     pycopy!(pyjlarraytype, jl.ArrayValue)
 end
 
-pyjl(v::AbstractArray) = pyjl(pyjlarraytype, v)
+pyjltype(::AbstractArray) = pyjlarraytype

src/jlwrap/base.jl

@@ -5,7 +5,6 @@ _pyjl_getvalue(x) = @autopy x C.PyJuliaValue_GetValue(getptr(x_))
 _pyjl_setvalue!(x, v) = @autopy x C.PyJuliaValue_SetValue(getptr(x_), v)
 
 pyjl(t, v) = pynew(errcheck(@autopy t C.PyJuliaValue_New(getptr(t_), v)))
-export pyjl
 
 """
     pyisjl(x)

src/jlwrap/dict.jl

@@ -104,4 +104,4 @@ function init_jlwrap_dict()
     pycopy!(pyjldicttype, jl.DictValue)
 end
 
-pyjl(v::AbstractDict) = pyjl(pyjldicttype, v)
+pyjltype(::AbstractDict) = pyjldicttype

src/jlwrap/io.jl

@@ -322,4 +322,4 @@ Wrap `io` as a Python text IO object.
 pytextio(v::IO) = pyjl(pyjltextiotype, v)
 export pytextio
 
-pyjl(v::IO) = pybinaryio(v)
+pyjltype(::IO) = pyjlbinaryiotype

src/jlwrap/iter.jl

@@ -40,4 +40,4 @@ function init_jlwrap_iter()
     pycopy!(pyjlitertype, jl.IteratorValue)
 end
 
-pyjl(v::Iterator) = pyjl(pyjlitertype, v)
+pyjltype(::Iterator) = pyjlitertype

src/jlwrap/module.jl

@@ -28,4 +28,4 @@ function init_jlwrap_module()
     pycopy!(pyjlmoduletype, jl.ModuleValue)
 end
 
-pyjl(v::Module) = pyjl(pyjlmoduletype, v)
+pyjltype(::Module) = pyjlmoduletype

src/jlwrap/number.jl

@@ -224,8 +224,8 @@ function init_jlwrap_number()
     pycopy!(pyjlintegertype, jl.IntegerValue)
 end
 
-pyjl(v::Number) = pyjl(pyjlnumbertype, v)
-pyjl(v::Complex) = pyjl(pyjlcomplextype, v)
-pyjl(v::Real) = pyjl(pyjlrealtype, v)
-pyjl(v::Rational) = pyjl(pyjlrationaltype, v)
-pyjl(v::Integer) = pyjl(pyjlintegertype, v)
+pyjltype(::Number) = pyjlnumbertype
+pyjltype(::Complex) = pyjlcomplextype
+pyjltype(::Real) = pyjlrealtype
+pyjltype(::Rational) = pyjlrationaltype
+pyjltype(::Integer) = pyjlintegertype

src/jlwrap/set.jl

@@ -121,4 +121,4 @@ function init_jlwrap_set()
     pycopy!(pyjlsettype, jl.SetValue)
 end
 
-pyjl(v::AbstractSet) = pyjl(pyjlsettype, v)
+pyjltype(::AbstractSet) = pyjlsettype