From bcaf0a0cc1e79eb5390a7ac0cf174e03a34d14af Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas <accounts@chrisrackauckas.com> Date: Thu, 30 May 2019 21:02:03 -0400 Subject: [PATCH 1/2] Switch to property overloaded PyCall Fixes hasproperty --- diffeqpy/setup.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diffeqpy/setup.jl b/diffeqpy/setup.jl index 4513b67..87455f0 100644 --- a/diffeqpy/setup.jl +++ b/diffeqpy/setup.jl @@ -6,10 +6,10 @@ PyCall.PyObject(::typeof(DiffEqBase.solve)) = function DiffEqBase.numargs(f::PyCall.PyObject) inspect = PyCall.pyimport("inspect") - haskey(f,:py_func) ? _f = f[:py_func] : _f = f + hasproperty(f,:py_func) ? _f = f.py_func : _f = f if PyCall.pyversion < v"3.0.0" - return length(first(inspect[:getargspec](_f))) + return length(first(inspect.getargspec(_f))) else - return length(first(inspect[:getfullargspec](_f))) + return length(first(inspect.getfullargspec(_f))) end end From 5bc9867e99a17d93b24998cbd02b794250b401ec Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas <accounts@chrisrackauckas.com> Date: Fri, 31 May 2019 12:42:16 -0400 Subject: [PATCH 2/2] Update setup.jl --- diffeqpy/setup.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diffeqpy/setup.jl b/diffeqpy/setup.jl index 87455f0..223c23b 100644 --- a/diffeqpy/setup.jl +++ b/diffeqpy/setup.jl @@ -6,7 +6,7 @@ PyCall.PyObject(::typeof(DiffEqBase.solve)) = function DiffEqBase.numargs(f::PyCall.PyObject) inspect = PyCall.pyimport("inspect") - hasproperty(f,:py_func) ? _f = f.py_func : _f = f + PyCall.hasproperty(f,:py_func) ? _f = f.py_func : _f = f if PyCall.pyversion < v"3.0.0" return length(first(inspect.getargspec(_f))) else