Add support for Selector arg to SelectorMethods.select().

neurokernel/plsel.py

@@ -1867,9 +1867,9 @@ def select(cls, df, selector, start=None, stop=None):
         ----------
         df : pandas.DataFrame
             DataFrame instance on which to apply the selector.
-        selector : str, unicode, or sequence
-            Selector string (e.g., '/foo[0:2]') or sequence of token sequences
-            (e.g., [['foo', (0, 2)]]).
+        selector : Selector, str, unicode, or sequence
+            Selector class instance, string (e.g., '/foo[0:2]') or
+            sequence of token sequences (e.g., [['foo', (0, 2)]]).
         start, stop : int
             Start and end indices in `row` over which to test entries.
 
@@ -1880,7 +1880,15 @@ def select(cls, df, selector, start=None, stop=None):
         """
 
         assert cls.is_selector(selector)
-        if type(selector) in [str, unicode]:
+        if isinstance(selector, Selector):
+            if len(df.index.names[start:stop])>1:
+                try:
+                    tks = list(selector.expanded)
+                    return df[tks]
+                except:
+                    pass
+            parse_list = list(selector.expanded)
+        elif type(selector) in [str, unicode]:
             if len(df.index.names[start:stop])>1:
                 try:
                     tks = cls.expand(selector)

tests/test_plsel.py

@@ -200,9 +200,9 @@ def test_select_Selector(self):
 
     def test_select_comma(self):
         result = self.sel.select(self.df, '/foo/qux,/baz/mof')
-        idx = pd.MultiIndex.from_tuples([('foo','qux',0),
-                                         ('foo','qux',1),
-                                         ('baz','mof',0)], names=[0, 1, 2])
+        idx = pd.MultiIndex.from_tuples([('foo','qux', 0),
+                                         ('foo','qux', 1),
+                                         ('baz','mof', 0)], names=[0, 1, 2])
         assert_frame_equal(result, self.df.ix[idx])
 
     def test_select_plus(self):