diff options
Diffstat (limited to 'Lib/lib2to3/fixes/fix_filter.py')
| -rw-r--r-- | Lib/lib2to3/fixes/fix_filter.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Lib/lib2to3/fixes/fix_filter.py b/Lib/lib2to3/fixes/fix_filter.py index 70d8f5e..08d3495 100644 --- a/Lib/lib2to3/fixes/fix_filter.py +++ b/Lib/lib2to3/fixes/fix_filter.py @@ -16,9 +16,9 @@ Python 2.6 figure it out. # Local imports from ..pgen2 import token from . import basefix -from .util import Name, Call, ListComp, does_tree_import, in_special_context +from .util import Name, Call, ListComp, in_special_context -class FixFilter(basefix.BaseFix): +class FixFilter(basefix.ConditionalFix): PATTERN = """ filter_lambda=power< @@ -47,20 +47,10 @@ class FixFilter(basefix.BaseFix): > """ - def start_tree(self, *args): - super(FixFilter, self).start_tree(*args) - self._new_filter = None - - def has_new_filter(self, node): - if self._new_filter is not None: - return self._new_filter - self._new_filter = does_tree_import('future_builtins', 'filter', node) - return self._new_filter + skip_on = "future_builtins.filter" def transform(self, node, results): - if self.has_new_filter(node): - # If filter is imported from future_builtins, we don't want to - # do anything here. + if self.should_skip(node): return if "filter_lambda" in results: |