Permalink
Browse files

more python3 fixes and cleanup

  • Loading branch information...
1 parent 8e849b3 commit a221783bcd6310ea236ba2c90d46c82fb60d88aa @tyarkoni tyarkoni committed Sep 1, 2015
Showing with 5 additions and 456 deletions.
  1. +4 −1 .gitignore
  2. +1 −2 neurosynth/analysis/decode.py
  3. +0 −10 neurosynth/base/lextab.py
  4. +0 −403 neurosynth/base/parser.out
  5. +0 −40 neurosynth/base/parsetab.py
View
@@ -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
@@ -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,
@@ -1,10 +0,0 @@
-# lextab.py. This file automatically created by PLY (version 3.6). Don't edit!
-_tabversion = '3.5'
-_lextokens = {'ANDNOT', 'LT', 'RPAR', 'LPAR', 'OR', 'WORD', 'FLOAT', 'AND', 'RT'}
-_lexreflags = 0
-_lexliterals = ''
-_lexstateinfo = {'INITIAL': 'inclusive'}
-_lexstatere = {'INITIAL': [('(?P<t_WORD>[a-zA-Z\\_\\-\\*]+)|(?P<t_FLOAT>[0-9\\.]+)|(?P<t_ANDNOT>\\&\\~)|(?P<t_AND>\\&)|(?P<t_LPAR>\\()|(?P<t_RPAR>\\))|(?P<t_RT>\\>)|(?P<t_LT>\\<)|(?P<t_OR>\\|)', [None, ('t_WORD', 'WORD'), ('t_FLOAT', 'FLOAT'), (None, 'ANDNOT'), (None, 'AND'), (None, 'LPAR'), (None, 'RPAR'), (None, 'RT'), (None, 'LT'), (None, 'OR')])]}
-_lexstateignore = {'INITIAL': ' \t'}
-_lexstateerrorf = {'INITIAL': 't_error'}
-_lexstateeoff = {}
Oops, something went wrong.

0 comments on commit a221783

Please sign in to comment.