tidy up some return values

Author: Christopher Doris

src/jlwrap/any.jl

@@ -82,7 +82,7 @@ function (op::pyjlany_op)(self, other_::Py)
         other = pyjlvalue(other_)
         Py(op.op(self, other))
     else
-        Py(pybuiltins.NotImplemented)
+        pybuiltins.NotImplemented
     end
 end
 function (op::pyjlany_op)(self, other_::Py, other2_::Py)
@@ -91,7 +91,7 @@ function (op::pyjlany_op)(self, other_::Py, other2_::Py)
         other2 = pyjlvalue(other2_)
         Py(op.op(self, other, other2))
     else
-        Py(pybuiltins.NotImplemented)
+        pybuiltins.NotImplemented
     end
 end
 pyjl_handle_error_type(op::pyjlany_op, self, exc) = exc isa MethodError && exc.f === op.op ? pybuiltins.TypeError : PyNULL
@@ -104,7 +104,7 @@ function (op::pyjlany_rev_op)(self, other_::Py)
         other = pyjlvalue(other_)
         Py(op.op(self, other))
     else
-        Py(pybuiltins.NotImplemented)
+        pybuiltins.NotImplemented
     end
 end
 function (op::pyjlany_rev_op)(self, other_::Py, other2_::Py)
@@ -113,7 +113,7 @@ function (op::pyjlany_rev_op)(self, other_::Py, other2_::Py)
         other2 = pyjlvalue(other2_)
         Py(op.op(self, other, other2))
     else
-        Py(pybuiltins.NotImplemented)
+        pybuiltins.NotImplemented
     end
 end
 pyjl_handle_error_type(op::pyjlany_rev_op, self, exc) = exc isa MethodError && exc.f === op.op ? pybuiltins.TypeError : PyNULL

src/jlwrap/array.jl

@@ -283,7 +283,7 @@ function pyjlarray_array_interface(x::AbstractArray{T,N}) where {T,N}
         end
     end
     errset(pybuiltins.AttributeError, "__array_interface__")
-    return pynew()
+    return PyNULL
 end
 pyjl_handle_error_type(::typeof(pyjlarray_array_interface), x, exc) = pybuiltins.AttributeError
 

src/jlwrap/io.jl

@@ -31,7 +31,7 @@ function pyjlio_seek(io::IO, offset_::Py, whence_::Py)
         pos = position(io) + offset
     else
         errset(pybuiltins.ValueError, "Argument 'whence' must be 0, 1 or 2")
-        return pynew()
+        return PyNULL
     end
     seek(io, pos)
     Py(position(io))
@@ -86,14 +86,14 @@ function pyjlbinaryio_readinto(io::IO, b::Py)
     if !pytruth(c)
         pydel!(c)
         errset(pybuiltins.ValueError, "input buffer is not contiguous")
-        return pynew()
+        return PyNULL
     end
     pydel!(c)
     buf = unsafe_load(C.PyMemoryView_GET_BUFFER(getptr(m)))
     if buf.readonly != 0
         pydel!(m)
         errset(pybuiltins.ValueError, "output buffer is read-only")
-        return pynew()
+        return PyNULL
     end
     data = unsafe_wrap(Array, Ptr{UInt8}(buf.buf), buf.len)
     nb = readbytes!(io, data)
@@ -108,7 +108,7 @@ function pyjlbinaryio_write(io::IO, b::Py)
     if !pytruth(c)
         pydel!(c)
         errset(pybuiltins.ValueError, "input buffer is not contiguous")
-        return pynew()
+        return PyNULL
     end
     pydel!(c)
     buf = unsafe_load(C.PyMemoryView_GET_BUFFER(getptr(m)))
@@ -196,7 +196,7 @@ function pyjltextio_write(io::IO, s_::Py)
         Py(length(s))
     else
         errset(pybuiltins.TypeError, "Argument 's' must be a 'str', got a '$(pytype(s_).__name__)'")
-        pynew()
+        PyNULL
     end
 end
 pyjl_handle_error_type(::typeof(pyjltextio_write), io, exc) = exc isa MethodError && exc.f === write ? pybuiltins.ValueError : PyNULL

src/jlwrap/iter.jl

@@ -17,7 +17,7 @@ function pyjliter_next(self::Iterator)
     end
     if z === nothing
         errset(pybuiltins.StopIteration)
-        pynew()
+        PyNULL
     else
         r, newst = z
         self.st = Some(newst)

src/jlwrap/number.jl

@@ -12,20 +12,20 @@ function (op::pyjlnumber_op)(self, other_::Py)
     if pyisjl(other_)
         other = pyjlvalue(other_)
     else
-        other = @pyconvert(Number, other_, return Py(pybuiltins.NotImplemented))
+        other = @pyconvert(Number, other_, return pybuiltins.NotImplemented)
     end
     Py(op.op(self, other))
 end
 function (op::pyjlnumber_op)(self, other_::Py, other2_::Py)
     if pyisjl(other_)
         other = pyjlvalue(other_)
     else
-        other = @pyconvert(Number, other_, return Py(pybuiltins.NotImplemented))
+        other = @pyconvert(Number, other_, return pybuiltins.NotImplemented)
     end
     if pyisjl(other2_)
         other2 = pyjlvalue(other2_)
     else
-        other2 = @pyconvert(Number, other2_, return Py(pybuiltins.NotImplemented))
+        other2 = @pyconvert(Number, other2_, return pybuiltins.NotImplemented)
     end
     Py(op.op(self, other, other2))
 end
@@ -38,20 +38,20 @@ function (op::pyjlnumber_rev_op)(self, other_::Py)
     if pyisjl(other_)
         other = pyjlvalue(other_)
     else
-        other = @pyconvert(Number, other_, return Py(pybuiltins.NotImplemented))
+        other = @pyconvert(Number, other_, return pybuiltins.NotImplemented)
     end
     Py(op.op(other, self))
 end
 function (op::pyjlnumber_rev_op)(self, other_::Py, other2_::Py)
     if pyisjl(other_)
         other = pyjlvalue(other_)
     else
-        other = @pyconvert(Number, other_, return Py(pybuiltins.NotImplemented))
+        other = @pyconvert(Number, other_, return pybuiltins.NotImplemented)
     end
     if pyisjl(other2_)
         other2 = pyjlvalue(other2_)
     else
-        other2 = @pyconvert(Number, other2_, return Py(pybuiltins.NotImplemented))
+        other2 = @pyconvert(Number, other2_, return pybuiltins.NotImplemented)
     end
     Py(op.op(other, self, other2))
 end

src/jlwrap/raw.jl

@@ -71,7 +71,7 @@ function pyjlraw_delitem(self, k_::Py)
 end
 
 pyjlraw_bool(self::Bool) = Py(self)
-pyjlraw_bool(self) = (errset(pybuiltins.TypeError, "Only Julia 'Bool' can be tested for truthyness"); pynew())
+pyjlraw_bool(self) = (errset(pybuiltins.TypeError, "Only Julia 'Bool' can be tested for truthyness"); PyNULL)
 
 function init_jlwrap_raw()
     jl = pyjuliacallmodule

src/jlwrap/set.jl

@@ -13,7 +13,7 @@ pyjlset_clear(x::AbstractSet) = (empty!(x); Py(nothing))
 function pyjlset_pop(x::AbstractSet)
     if isempty(x)
         errset(pybuiltins.KeyError, "pop from an empty set")
-        pynew()
+        PyNULL
     else
         Py(pop!(x))
     end
@@ -22,14 +22,14 @@ end
 function pyjlset_remove(x::AbstractSet, v_::Py)
     v = @pyconvert eltype(x) v_ begin
         errset(pybuiltins.KeyError, v_)
-        return pynew()
+        return PyNULL
     end
     if v in x
         delete!(x, v)
         return Py(nothing)
     else
         errset(pybuiltins.KeyError, v_)
-        return pynew()
+        return PyNULL
     end
 end
 

src/jlwrap/vector.jl

@@ -41,7 +41,7 @@ function pyjlvector_insert(x::AbstractVector, k_::Py, v_::Py)
         return Py(nothing)
     else
         errset(pybuiltins.IndexError, "array index out of bounds");
-        return pynew()
+        return PyNULL
     end
 end
 
@@ -75,20 +75,20 @@ function pyjlvector_pop(x::AbstractVector, k_::Py)
         return Py(v)
     else
         errset(pybuiltins.IndexError, "pop from empty array")
-        return pynew()
+        return PyNULL
     end
 end
 
 function pyjlvector_remove(x::AbstractVector, v_::Py)
     v = @pyconvert eltype(x) v_ begin
         errset(pybuiltins.ValueError, "value not in array")
-        return pynew()
+        return PyNULL
     end
     v = pyconvert_result(r)
     k = findfirst(==(v), x)
     if k === nothing
         errset(pybuiltins.ValueError, "value not in array")
-        return pynew()
+        return PyNULL
     end
     deleteat!(x, k)
     Py(nothing)
@@ -97,12 +97,12 @@ end
 function pyjlvector_index(x::AbstractVector, v_::Py)
     v = @pyconvert eltype(x) v_ begin
         errset(pybuiltins.ValueError, "value not in array")
-        return pynew()
+        return PyNULL
     end
     k = findfirst(==(v), x)
     if k === nothing
         errset(pybuiltins.ValueError, "value not in array")
-        return pynew()
+        return PyNULL
     end
     Py(k - first(axes(x, 1)))
 end