mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 61724-61725 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r61724 | martin.v.loewis | 2008-03-22 01:01:12 +0100 (Sa, 22 Mär 2008) | 49 lines

  Merged revisions 61602-61723 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r61626 | david.wolever | 2008-03-19 17:19:16 +0100 (Mi, 19 Mär 2008) | 1 line

    Added fixer for implicit local imports.  See #2414.
  ........
    r61628 | david.wolever | 2008-03-19 17:57:43 +0100 (Mi, 19 Mär 2008) | 1 line

    Added a class for tests which should not run if a particular import is found.
  ........
    r61629 | collin.winter | 2008-03-19 17:58:19 +0100 (Mi, 19 Mär 2008) | 1 line

    Two more relative import fixes in pgen2.
  ........
    r61635 | david.wolever | 2008-03-19 20:16:03 +0100 (Mi, 19 Mär 2008) | 1 line

    Fixed print fixer so it will do the Right Thing when it encounters __future__.print_function.  2to3 gets upset, though, so the tests have been commented out.
  ........
    r61637 | david.wolever | 2008-03-19 21:37:17 +0100 (Mi, 19 Mär 2008) | 3 lines

    Added a fixer for itertools imports (from itertools import imap, ifilterfalse --> from itertools import filterfalse)
  ........
    r61645 | david.wolever | 2008-03-19 23:22:35 +0100 (Mi, 19 Mär 2008) | 1 line

    SVN is happier when you add the files you create... -_-'
  ........
    r61654 | david.wolever | 2008-03-20 01:09:56 +0100 (Do, 20 Mär 2008) | 1 line

    Added an explicit sort order to fixers -- fixes problems like #2427
  ........
    r61664 | david.wolever | 2008-03-20 04:32:40 +0100 (Do, 20 Mär 2008) | 3 lines

    Fixes #2428 -- comments are no longer eatten by __future__ fixer.
  ........
    r61673 | david.wolever | 2008-03-20 17:22:40 +0100 (Do, 20 Mär 2008) | 1 line

    Added 2to3 node pretty-printer
  ........
    r61679 | david.wolever | 2008-03-20 20:50:42 +0100 (Do, 20 Mär 2008) | 1 line

    Made node printing a little bit prettier
  ........
    r61723 | martin.v.loewis | 2008-03-22 00:59:27 +0100 (Sa, 22 Mär 2008) | 2 lines

    Fix whitespace.
  ........
................
  r61725 | martin.v.loewis | 2008-03-22 01:02:41 +0100 (Sa, 22 Mär 2008) | 2 lines

  Install lib2to3.
................
This commit is contained in:
Martin v. Löwis 2008-03-22 00:07:09 +00:00
parent 896c317b43
commit 3faa84f18e
15 changed files with 352 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/lib2to3/fixes/fix_map.py
View file

@ -22,10 +22,10 @@ soon as the shortest argument is exhausted.
# 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
from ..pygram import python_symbols as syms
class FixMap(basefix.BaseFix):
class FixMap(basefix.ConditionalFix):
PATTERN = """
map_none=power<
@ -54,20 +54,10 @@ class FixMap(basefix.BaseFix):
>
"""
def start_tree(self, *args):
super(FixMap, self).start_tree(*args)
self._future_map_found = None
def has_future_map(self, node):
if self._future_map_found is not None:
return self._future_map_found
self._future_map_found = does_tree_import('future_builtins', 'map', node)
return self._future_map_found
skip_on = 'future_builtins.map'
def transform(self, node, results):
if self.has_future_map(node):
# If a future map has been imported for this file, we won't
# be making any modifications
if self.should_skip(node):
return
if node.parent.type == syms.simple_stmt: