mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 61602 via svnmerge from

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

................
  r61602 | martin.v.loewis | 2008-03-19 00:22:42 -0500 (Mi, 19 Mär 2008) | 17 lines

  Merged revisions 61598-61599,61601 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3

  ........
    r61598 | david.wolever | 2008-03-18 23:58:33 -0500 (Di, 18 Mär 2008) | 1 line

    Added fixer for zip, and refactored a bit of code in the process.  Closing #2171.
  ........
    r61599 | david.wolever | 2008-03-19 00:04:26 -0500 (Mi, 19 Mär 2008) | 3 lines

    Removed a bunch of duplicate code -- it's in util now.
  ........
    r61601 | martin.v.loewis | 2008-03-19 00:21:12 -0500 (Mi, 19 Mär 2008) | 2 lines

    Fix whitespace.
  ........
................
This commit is contained in:
Martin v. Löwis 2008-03-19 05:26:18 +00:00
parent ef04c44e29
commit f733c60d9a
24 changed files with 249 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Lib/lib2to3/fixes/fix_zip.py Normal file
View file

@ -0,0 +1,43 @@
"""
Fixer that changes zip(seq0, seq1, ...) into list(zip(seq0, seq1, ...)
unless there exists a 'from future_builtins import zip' statement in the
top-level namespace.
We avoid the transformation if the zip() call is directly contained in
iter(<>), list(<>), tuple(<>), sorted(<>), ...join(<>), or for V in <>:.
"""
# Local imports
from . import basefix
from .util import Name, Call, does_tree_import, in_special_context
class FixZip(basefix.BaseFix):
PATTERN = """
power< 'zip' args=trailer< '(' [any] ')' >
>
"""
def start_tree(self, *args):
super(FixZip, self).start_tree(*args)
self._future_zip_found = None
def has_future_zip(self, node):
if self._future_zip_found is not None:
return self._future_zip_found
self._future_zip_found = does_tree_import('future_builtins', 'zip', node)
return self._future_zip_found
def transform(self, node, results):
if self.has_future_zip(node):
# If a future zip has been imported for this file, we won't
# be making any modifications
return
if in_special_context(node):
return None
new = node.clone()
new.set_prefix("")
new = Call(Name("list"), [new])
new.set_prefix(node.get_prefix())
return new