conversion to pywrapper now has eltype Any

Author: Christopher Doris

docs/src/releasenotes.md

@@ -1,6 +1,8 @@
 # Release Notes
 
 ## Unreleased
+* Conversion to wrapper types `PyList`, `PySet`, `PyDict` or `PyIterable` now default to
+  having element type `Any` instead of `Py`.
 * The `__repr__` method of wrapped Julia objects now uses the 3-arg show method for nicer
   (richer and truncated) display at the Python REPL.
 * Bug fixes.

src/pywrap/PyDict.jl

@@ -17,16 +17,9 @@ PyDict(x=pydict()) = PyDict{Py,Py}(x)
 ispy(::PyDict) = true
 Py(x::PyDict) = x.py
 
-pyconvert_rule_mapping(::Type{T}, x::Py, ::Type{PyDict{K,V}}=Utils._type_ub(T)) where {T<:PyDict,K,V} =
-    if PyDict{Py,Py} <: T
-        pyconvert_return(PyDict{Py,Py}(x))
-    elseif PyDict{K,Py} <: T
-        pyconvert_return(PyDict{K,Py}(x))
-    elseif PyDict{Py,V} <: T
-        pyconvert_return(PyDict{Py,V}(x))
-    else
-        pyconvert_return(PyDict{K,V}(x))
-    end
+function pyconvert_rule_mapping(::Type{T}, x::Py, ::Type{T1}=Utils._type_ub(T)) where {T<:PyDict,T1}
+    pyconvert_return(T1(x))
+end
 
 Base.length(x::PyDict) = Int(pylen(x))
 

src/pywrap/PyIterable.jl

@@ -27,9 +27,6 @@ function Base.iterate(x::PyIterable{T}, it::Py=pyiter(x)) where {T}
     end
 end
 
-pyconvert_rule_iterable(::Type{T}, x::Py, ::Type{PyIterable{V}}=Utils._type_ub(T)) where {T<:PyIterable,V} =
-    if PyIterable{Py} <: T
-        pyconvert_return(PyIterable{Py}(x))
-    else
-        pyconvert_return(PyIterable{V}(x))
-    end
+function pyconvert_rule_iterable(::Type{T}, x::Py, ::Type{T1}=Utils._type_ub(T)) where {T<:PyIterable,T1}
+    pyconvert_return(T1(x))
+end

src/pywrap/PyList.jl

@@ -16,12 +16,9 @@ PyList(x=pylist()) = PyList{Py}(x)
 ispy(::PyList) = true
 Py(x::PyList) = x.py
 
-pyconvert_rule_sequence(::Type{T}, x::Py, ::Type{PyList{V}}=Utils._type_ub(T)) where {T<:PyList,V} =
-    if PyList{Py} <: T
-        pyconvert_return(PyList{Py}(x))
-    else
-        pyconvert_return(PyList{V}(x))
-    end
+function pyconvert_rule_sequence(::Type{T}, x::Py, ::Type{T1}=Utils._type_ub(T)) where {T<:PyList,T1}
+    pyconvert_return(T1(x))
+end
 
 Base.length(x::PyList) = Int(pylen(x))
 

src/pywrap/PySet.jl

@@ -16,12 +16,9 @@ PySet(x=pyset()) = PySet{Py}(x)
 ispy(::PySet) = true
 Py(x::PySet) = x.py
 
-pyconvert_rule_set(::Type{T}, x::Py, ::Type{PySet{V}}=Utils._type_ub(T)) where {T<:PySet,V} =
-    if PySet{Py} <: T
-        pyconvert_return(PySet{Py}(x))
-    else
-        pyconvert_return(PySet{V}(x))
-    end
+function pyconvert_rule_set(::Type{T}, x::Py, ::Type{T1}=Utils._type_ub(T)) where {T<:PySet,T1}
+    pyconvert_return(T1(x))
+end
 
 Base.length(x::PySet) = Int(pylen(x))
 

test/convert.jl

@@ -171,8 +171,8 @@ end
 
 @testitem "mapping → PyDict" begin
     x1 = pyconvert(PyDict, pydict([1=>11, 2=>22, 3=>33]))
-    @test x1 isa PyDict{Py,Py}
-    @test isequal(x1, Dict([Py(1)=>Py(11), Py(2)=>Py(22), Py(3)=>Py(33)]))
+    @test x1 isa PyDict{Any,Any}
+    @test isequal(x1, Dict([1=>11, 2=>22, 3=>33]))
     x2 = pyconvert(PyDict{Int,Int}, pydict([1=>11, 2=>22, 3=>33]))
     @test x2 isa PyDict{Int,Int}
     @test x2 == Dict(1=>11, 2=>22, 3=>33)
@@ -189,17 +189,17 @@ end
 
 @testitem "sequence → PyList" begin
     x1 = pyconvert(PyList, pylist([1, 2, 3]))
-    @test x1 isa PyList{Py}
-    @test isequal(x1, [Py(1), Py(2), Py(3)])
+    @test x1 isa PyList{Any}
+    @test isequal(x1, [1, 2, 3])
     x2 = pyconvert(PyList{Int}, pylist([1, 2, 3]))
     @test x2 isa PyList{Int}
     @test x2 == [1, 2, 3]
 end
 
 @testitem "set → PySet" begin
     x1 = pyconvert(PySet, pyset([1, 2, 3]))
-    @test x1 isa PySet{Py}
-    @test isequal(x1, Set([Py(1), Py(2), Py(3)]))
+    @test x1 isa PySet{Any}
+    @test isequal(x1, Set([1, 2, 3]))
     x2 = pyconvert(PySet{Int}, pyset([1, 2, 3]))
     @test x2 isa PySet{Int}
     @test x2 == Set([1, 2, 3])