Merge pull request #65 from tk3369/master

Removed Ix indexer and updated Index/MultiIndex path

Author: malmaud

src/Pandas.jl

@@ -30,11 +30,18 @@ function __init__()
     end
 end
 
+"""
+    version()
+
+Returns the version of the underlying Python Pandas library as a VersionNumber.
+"""
+version() = VersionNumber(pandas_raw.__version__)
+
 const pre_type_map = []
 
 # Maps a python object corresponding to a Pandas class to a Julia type which
 # wraps that class.
-const type_map = Dict{PyObject, Type}()
+const type_map = Dict()
 
 abstract type PandasWrapped end
 
@@ -102,6 +109,7 @@ to that class.
 """
 function pandas_wrap(pyo::PyObject)
     for (pyt, pyv) in type_map
+        pyt === nothing && continue
         if pyisinstance(pyo, pyt)
             return pyv(pyo)
         end
@@ -185,7 +193,6 @@ macro pyasvec(class)
             end
         end
     end
-
     if class in [:Iloc, :Loc, :Ix]
         length_expr = quote
             function $(esc(:length))(x::$class)
@@ -213,11 +220,11 @@ end
 
 @pytype DataFrame ()->pandas_raw.core.frame."DataFrame"
 @pytype Iloc ()->pandas_raw.core.indexing."_iLocIndexer"
-@pytype Loc ()->pandas_raw.core.indexing."_LocIndexer"
-@pytype Ix ()->pandas_raw.core.indexing."_IXIndexer"
 @pytype Series ()->pandas_raw.core.series."Series"
-@pytype MultiIndex ()->pandas_raw.core.index."MultiIndex"
-@pytype Index ()->pandas_raw.core.index."Index"
+@pytype Ix ()->version() < VersionNumber(1) ? pandas_raw.core.indexing."_IXIndexer" : nothing
+@pytype MultiIndex ()->version() < VersionNumber(1) ? pandas_raw.core.index."MultiIndex" : pandas_raw.core.indexes.multi."MultiIndex"
+@pytype Index ()->version() < VersionNumber(1) ? pandas_raw.core.index."Index" : pandas_raw.core.indexes.multi."Index" 
+@pytype Loc ()->pandas_raw.core.indexing."_LocIndexer"
 @pytype GroupBy ()->pandas_raw.core.groupby."DataFrameGroupBy"
 @pytype SeriesGroupBy ()->pandas_raw.core.groupby."SeriesGroupBy"
 @pytype Rolling () -> pandas_raw.core.window."Rolling"

src/exports.jl

@@ -48,7 +48,6 @@ GroupBy,
 Rolling,
 Iloc,
 Index,
-Ix,
 Loc,
 MultiIndex,
 Series,