rename pynext to unsafe_pynext

Author: Christopher Doris

src/Py.jl

@@ -260,7 +260,7 @@ Base.eltype(::Type{Py}) = Py
 Base.IteratorSize(::Type{Py}) = Base.SizeUnknown()
 
 function Base.iterate(x::Py, it::Py=pyiter(x))
-    v = pynext(it)
+    v = unsafe_pynext(it)
     if ispynull(v)
         pydel!(it)
         nothing

src/abstract/collection.jl

@@ -2,7 +2,7 @@
 
 function _pyconvert_rule_iterable(ans::Vector{T0}, it::Py, ::Type{T1}) where {T0,T1}
     @label again
-    x_ = pynext(it)
+    x_ = unsafe_pynext(it)
     if ispynull(x_)
         pydel!(it)
         return pyconvert_return(ans)
@@ -28,7 +28,7 @@ end
 
 function _pyconvert_rule_iterable(ans::Set{T0}, it::Py, ::Type{T1}) where {T0,T1}
     @label again
-    x_ = pynext(it)
+    x_ = unsafe_pynext(it)
     if ispynull(x_)
         pydel!(it)
         return pyconvert_return(ans)
@@ -54,7 +54,7 @@ end
 
 function _pyconvert_rule_mapping(ans::Dict{K0,V0}, x::Py, it::Py, ::Type{K1}, ::Type{V1}) where {K0,V0,K1,V1}
     @label again
-    k_ = pynext(it)
+    k_ = unsafe_pynext(it)
     if ispynull(k_)
         pydel!(it)
         return pyconvert_return(ans)
@@ -127,21 +127,21 @@ end
 
 function pyconvert_rule_iterable(::Type{R}, x::Py, ::Type{Pair{K0,V0}}=Utils._type_lb(R), ::Type{Pair{K1,V1}}=Utils._type_ub(R)) where {R<:Pair,K0,V0,K1,V1}
     it = pyiter(x)
-    k_ = pynext(it)
+    k_ = unsafe_pynext(it)
     if ispynull(k_)
         pydel!(it)
         pydel!(k_)
         return pyconvert_unconverted()
     end
     k = @pyconvert_and_del(K1, k_)
-    v_ = pynext(it)
+    v_ = unsafe_pynext(it)
     if ispynull(v_)
         pydel!(it)
         pydel!(v_)
         return pyconvert_unconverted()
     end
     v = @pyconvert_and_del(V1, v_)
-    z_ = pynext(it)
+    z_ = unsafe_pynext(it)
     pydel!(it)
     if ispynull(z_)
         pydel!(z_)

src/abstract/iter.jl

@@ -6,5 +6,9 @@ Equivalent to `iter(x)` in Python.
 pyiter(x) = pynew(errcheck(@autopy x C.PyObject_GetIter(getptr(x_))))
 export pyiter
 
-pynext(x::Py) = pynew(errcheck_ambig(C.PyIter_Next(getptr(x))))
-export pyiter
+"""
+    unsafe_pynext(x)
+
+Return the next item in the iterator `x`. When there are no more items, return NULL.
+"""
+unsafe_pynext(x::Py) = pynew(errcheck_ambig(C.PyIter_Next(getptr(x))))

src/py_macro.jl

@@ -595,7 +595,7 @@ function py_macro_lower(st, body, ans, ex; flavour=:expr)
         push!(body, :($i = $pyiter($y)))
         py_macro_del(body, y, ty)
         body2 = []
-        push!(body2, :($v = $pynext($i)))
+        push!(body2, :($v = $unsafe_pynext($i)))
         push!(body2, Expr(:if, :($ispynull($v)), Expr(:block, :($pydel!($v)), :(break))))
         py_macro_lower_assign(st, body2, ax, v)
         py_macro_del(body2, v, true)

src/pywrap/PyDict.jl

@@ -33,7 +33,7 @@ pyconvert_rule_mapping(::Type{T}, x::Py, ::Type{PyDict{K,V}}=Utils._type_ub(T))
 Base.length(x::PyDict) = Int(pylen(x))
 
 function Base.iterate(x::PyDict{K,V}, it::Py=pyiter(x)) where {K,V}
-    k_ = pynext(it)
+    k_ = unsafe_pynext(it)
     ispynull(k_) && return nothing
     v_ = pygetitem(x, k_)
     k = pyconvert_and_del(K, k_)
@@ -42,7 +42,7 @@ function Base.iterate(x::PyDict{K,V}, it::Py=pyiter(x)) where {K,V}
 end
 
 function Base.iterate(x::Base.KeySet{K,PyDict{K,V}}, it::Py=pyiter(x.dict)) where {K,V}
-    k_ = pynext(it)
+    k_ = unsafe_pynext(it)
     ispynull(k_) && return nothing
     k = pyconvert_and_del(K, k_)
     return (k, it)

src/pywrap/PyIterable.jl

@@ -20,7 +20,7 @@ Base.IteratorSize(::Type{PyIterable{T}}) where {T} = Base.SizeUnknown()
 Base.eltype(::Type{PyIterable{T}}) where {T} = T
 
 function Base.iterate(x::PyIterable{T}, it::Py=pyiter(x)) where {T}
-    y = pynext(it)
+    y = unsafe_pynext(it)
     if ispynull(y)
         pydel!(it)
         return nothing

src/pywrap/PySet.jl

@@ -30,7 +30,7 @@ Base.length(x::PySet) = Int(pylen(x))
 Base.isempty(x::PySet) = length(x) == 0
 
 function Base.iterate(x::PySet{T}, it::Py=pyiter(x)) where {T}
-    y = pynext(it)
+    y = unsafe_pynext(it)
     if ispynull(y)
         pydel!(it)
         return nothing

test/abstract.jl

@@ -213,13 +213,13 @@ end
     @test_throws PyException pyiter(pybuiltins.None)
     @test_throws PyException pyiter(pybuiltins.True)
     it = pyiter(pyrange(2))
-    x = PythonCall.pynext(it)
+    x = PythonCall.unsafe_pynext(it)
     @test !PythonCall.ispynull(x)
     @test pyeq(Bool, x, 0)
-    x = PythonCall.pynext(it)
+    x = PythonCall.unsafe_pynext(it)
     @test !PythonCall.ispynull(x)
     @test pyeq(Bool, x, 1)
-    x = PythonCall.pynext(it)
+    x = PythonCall.unsafe_pynext(it)
     @test PythonCall.ispynull(x)
 end