Skip to content

Use dir instead of getmembers #879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 18, 2021
Merged

Use dir instead of getmembers #879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a2155c1
Use dir instead of getmembers
sethaxen Jan 16, 2021
d1534fd
Add property decorator tests
sethaxen Jan 16, 2021
cebe67e
Use cpython api function for dir
sethaxen Jan 16, 2021
1785ee7
Don't try to test properties
sethaxen Jan 16, 2021
76be31a
Check if return value is NULL
sethaxen Jan 16, 2021
b8c6ec9
Deprecate keys
sethaxen Jan 16, 2021
173542e
Add deprecation test
sethaxen Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/PyCall.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,11 @@ function trygetproperty(o::PyObject, s::AbstractString, d)
return p == C_NULL ? d : PyObject(p)
end

propertynames(o::PyObject) = ispynull(o) ? Symbol[] : map(x->Symbol(first(x)), PyIterator{PyObject}(pycall(inspect."getmembers", PyObject, o)))
function propertynames(o::PyObject)
ispynull(o) && return Symbol[]
names = @pycheckn ccall((@pysym :PyObject_Dir), PyObject, (PyPtr,), o)
return convert(Vector{Symbol}, names)
end

# avoiding method ambiguity
setproperty!(o::PyObject, s::Symbol, v) = _setproperty!(o,s,v)
Expand Down Expand Up @@ -366,8 +370,7 @@ hasproperty(o::PyObject, s::AbstractString) = pyhasproperty(o, s)

#########################################################################

keys(o::PyObject) = Symbol[m[1] for m in pycall(inspect."getmembers",
PyVector{Tuple{Symbol,PyObject}}, o)]
@deprecate keys(o::PyObject) propertynames(o)

#########################################################################
# Create anonymous composite w = pywrap(o) wrapping the object o
Expand Down
7 changes: 6 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,17 +295,22 @@ const PyInt = pyversion < v"3" ? Int : Clonglong
class A:
class B:
C = 1
@property
def D(self):
raise NotImplementedError
"""
A = py"A"
@test hasproperty(A, "B")
@test getproperty(A, "B") == py"A.B"
@test :B in propertynames(A)
@static if VERSION >= v"0.7-"
@test :D in propertynames(A.B)
@test A.B.C == 1
@test_throws KeyError A.X
end
setproperty!(py"A.B", "C", 2)
@test py"A.B.C" == 2
@test_deprecated keys(A)

# buffers
let b = PyCall.PyBuffer(pyutf8("test string"))
Expand All @@ -317,7 +322,7 @@ const PyInt = pyversion < v"3" ? Int : Clonglong

let o = PyObject(1+2im)
@test PyCall.hasproperty(o, :real) # replace by Base.hasproperty in the future
@test :real in keys(o)
@test :real in propertynames(o)
@test o.real == 1
end

Expand Down