Skip to content

Commit

Permalink
Merge pull request #171 from darwindarak/dd/typo_cd
Browse files Browse the repository at this point in the history
Fix misnamed variable introduced by in #169
  • Loading branch information
stevengj committed Jul 24, 2015
2 parents e506c9d + f42d719 commit 1e9387b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/conversions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ convert(::Type{PyDict}, o::PyObject) = PyDict(o)
convert{K,V}(::Type{PyDict{K,V}}, o::PyObject) = PyDict{K,V}(o)
unsafe_convert(::Type{PyPtr}, d::PyDict) = d.o.o

haskey(d::PyDict, key) = 1 == (c.isdict ?
haskey(d::PyDict, key) = 1 == (d.isdict ?
ccall(@pysym(:PyDict_Contains), Cint, (PyPtr, PyPtr), d, PyObject(key)) :
ccall(@pysym(:PyMapping_HasKey), Cint, (PyPtr, PyPtr), d, PyObject(key)))

Expand Down

0 comments on commit 1e9387b

Please sign in to comment.