@@ -34,8 +34,6 @@ const type_map = Dict{PyObject, Type}()
34
34
35
35
abstract type PandasWrapped end
36
36
37
- convert (:: Type{PyObject} , x:: PandasWrapped ) = x. pyo
38
-
39
37
macro pytype (name, class)
40
38
quote
41
39
immutable $ (name) <: PandasWrapped
@@ -112,11 +110,12 @@ end
112
110
pyattr (class, method) = pyattr (class, method, method)
113
111
114
112
function pyattr (class, jl_method, py_method)
115
- m_quote = quot (py_method)
113
+ # m_quote = quot(py_method)
114
+ m_quote = string (py_method)
116
115
quote
117
116
function $ (esc (jl_method))(pyt:: $class , args... ; kwargs... )
118
117
new_args = fix_arg .(args)
119
- pyo = pyt. pyo[$ m_quote ](new_args... ; kwargs... )
118
+ pyo = pyt. pyo[$ ( string (py_method)) ](new_args... ; kwargs... )
120
119
wrapped = pandas_wrap (pyo)
121
120
end
122
121
end
@@ -263,7 +262,7 @@ for m in [:read_pickle, :read_csv, :read_html, :read_json, :read_excel, :read_ta
263
262
:expanding_quantile , :rolling_window , :to_numeric ]
264
263
@eval begin
265
264
function $m (args... ; kwargs... )
266
- pandas_raw[m ](args... ; kwargs... )
265
+ pandas_wrap ( pandas_raw[$ ( string (m)) ](args... ; kwargs... ) )
267
266
end
268
267
end
269
268
end
0 commit comments