more python3 fixes and cleanup

neurosynth · Sep 1, 2015 · a221783 · a221783
1 parent 8e849b3
commit a221783
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 456 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,7 @@ dist
 dist/*
 .ipynb_checkpoints
 docs/_*/*
-neurosynth.egg-info
+neurosynth.egg-info
+neurosynth/base/lextab.py
+neurosynth/base/parser.out
+neurosynth/base/parsetab.py
diff --git a/neurosynth/analysis/decode.py b/neurosynth/analysis/decode.py
@@ -163,8 +163,7 @@ def _load_features_from_dataset(self, features=None, image_type=None,
         """
         self.feature_names = self.dataset.feature_table.feature_names
         if features is not None:
-            self.feature_names = filter(
-                lambda x: x in self.feature_names, features)
+            self.feature_names = [f for f in features if f in self.feature_names]
         from neurosynth.analysis import meta
         self.feature_images = meta.analyze_features(
             self.dataset, self.feature_names, image_type=image_type,

diff --git a/neurosynth/base/lextab.py b/neurosynth/base/lextab.py