Merge pull request #353 from AdinaWagner/enh-bfs

ENH/BF: add check for run_info to be a list, pass run_info in correct position.

bids/variables/__init__.py

@@ -9,7 +9,6 @@
     'SimpleVariable',
     'SparseRunVariable',
     'DenseRunVariable',
-    'BIDSRunInfo',
     'BIDSVariableCollection',
     'BIDSRunVariableCollection',
     'merge_collections',

bids/variables/variables.py

@@ -253,9 +253,7 @@ def split(self, grouper):
         subsets = []
         for i, (name, g) in enumerate(data.groupby(grouper)):
             name = '%s.%s' % (self.name, name)
-            args = [name, g, self.source]
-            if hasattr(self, 'run_info'):
-                args.append(self.run_info)
+            args = [name, g, getattr(self, 'run_info', None), self.source]
             col = self.__class__(*args)
             subsets.append(col)
         return subsets
@@ -301,6 +299,9 @@ class SparseRunVariable(SimpleVariable):
     def __init__(self, name, data, run_info, source, **kwargs):
         if hasattr(run_info, 'duration'):
             run_info = [run_info]
+        if not isinstance(run_info, list):
+            raise TypeError("We expect a list of run_info, got %s"
+                            % repr(run_info))
         self.run_info = run_info
         for sc in self._property_columns:
             setattr(self, sc, data.pop(sc).values)