more 0.7 fixes

Author: stevengj

Diff for: src/PyCall.jl

@@ -812,6 +812,7 @@ setindex!(o::PyObject, v, i1::Integer, i2::Integer) = set!(o, (ind2py(i1),ind2py
 getindex(o::PyObject, I::Integer...) = get(o, map(ind2py, I))
 setindex!(o::PyObject, v, I::Integer...) = set!(o, map(ind2py, I), v)
 length(o::PyObject) = @pycheckz ccall((@pysym :PySequence_Size), Int, (PyPtr,), o)
+size(o::PyObject) = (length(o),)
 firstindex(o::PyObject) = 1
 lastindex(o::PyObject) = length(o)
 

Diff for: src/numpy.jl

@@ -346,7 +346,7 @@ function copy(a::PyArray{T,N}) where {T,N}
         ccall(:memcpy, Cvoid, (Ptr{T}, Ptr{T}, Int), A, a, sizeof(T)*length(a))
         return A
     else
-        return copy!(A, a)
+        return copyto!(A, a)
     end
 end
 

Diff for: src/pyiterator.jl

@@ -83,3 +83,20 @@ function pyjlwrap_getiter(self_::PyPtr)
     end
     return PyPtr_NULL
 end
+
+#########################################################################
+# Broadcasting: if the object is iterable, return collect(o), and otherwise
+#               return o.
+
+@static if isdefined(Base.Broadcast, :broadcastable)
+    function Base.Broadcast.broadcastable(o::PyObject)
+        iter = ccall((@pysym :PyObject_GetIter), PyPtr, (PyPtr,), o)
+        if iter == C_NULL
+            pyerr_clear()
+            return Ref(o)
+        else
+            ccall(@pysym(:Py_DecRef), Cvoid, (PyPtr,), iter)
+            return collect(o)
+        end
+    end
+end

Diff for: test/runtests.jl

@@ -414,7 +414,7 @@ pymodule_exists(s::AbstractString) = !ispynull(pyimport_e(s))
 
     # updating operators .+= etcetera
     let o = PyObject(Any[1,2]), c = o
-        o .+= Any[3,4]
+        broadcast!(+, o, o, Any[3,4]) # o .+= x doesn't work yet in 0.7
         @test collect(o) == [1,2,3,4]
         @test o.o == c.o # updated in-place
     end
@@ -510,6 +510,12 @@ pymodule_exists(s::AbstractString) = !ispynull(pyimport_e(s))
     @test pyfunctionret(factorial, nothing, Int)(3) === nothing
     @test PyCall.is_pyjlwrap(pycall(pyfunctionret(factorial, Any, Int), PyObject, 3))
     @test pyfunctionret(max, Int, Vararg{Int})(3,4,5) === 5
+
+    # broadcasting scalars
+    let o = PyObject(3) .+ [1,4]
+        @test o isa Vector{PyObject}
+        @test o == [4,7]
+    end
 end
 
 ######################################################################