mirror of
https://github.com/python/cpython.git
synced 2024-12-01 03:01:36 +01:00
b0871cac11
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r85510 | benjamin.peterson | 2010-10-14 18:00:04 -0500 (Thu, 14 Oct 2010) | 61 lines Merged revisions 83852-83853,83857,84042,84216,84274-84276,84375,85388,85478,85506-85508 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r83852 | benjamin.peterson | 2010-08-08 15:45:44 -0500 (Sun, 08 Aug 2010) | 1 line wrap with parens ........ r83853 | benjamin.peterson | 2010-08-08 15:46:31 -0500 (Sun, 08 Aug 2010) | 1 line use parens ........ r83857 | benjamin.peterson | 2010-08-08 15:59:49 -0500 (Sun, 08 Aug 2010) | 1 line things which use touch_import should be pre order ........ r84042 | george.boutsioukis | 2010-08-14 16:10:19 -0500 (Sat, 14 Aug 2010) | 2 lines This revision incorporates into the 2to3 tool the new, faster, tree matching algorithm developed during a GSOC project. The algorithm resides in the two added modules, btm_matcher and btm_utils. New code has been added to drive the new matching process in refactor.py and a few minor changes were made in other modules. A BM_compatible flag(False by default) has been added in fixer_base and it is set to True in most of the current fixers. ........ r84216 | benjamin.peterson | 2010-08-19 16:44:05 -0500 (Thu, 19 Aug 2010) | 1 line allow star_expr in testlist_gexp ........ r84274 | benjamin.peterson | 2010-08-22 18:40:46 -0500 (Sun, 22 Aug 2010) | 1 line wrap long line ........ r84275 | benjamin.peterson | 2010-08-22 18:42:22 -0500 (Sun, 22 Aug 2010) | 1 line cleanup ........ r84276 | benjamin.peterson | 2010-08-22 18:51:01 -0500 (Sun, 22 Aug 2010) | 1 line when there's a None value and a traceback, don't call type with it #9661 ........ r84375 | george.boutsioukis | 2010-08-31 08:38:53 -0500 (Tue, 31 Aug 2010) | 3 lines Idiomatic code changes & stylistic issues fixed in the BottomMatcher module. Thanks to Benjamin Peterson for taking the time to review the code. ........ r85388 | benjamin.peterson | 2010-10-12 17:27:44 -0500 (Tue, 12 Oct 2010) | 1 line fix urllib fixer with multiple as imports on a line #10069 ........ r85478 | benjamin.peterson | 2010-10-14 08:09:56 -0500 (Thu, 14 Oct 2010) | 1 line stop abusing docstrings ........ r85506 | benjamin.peterson | 2010-10-14 17:45:19 -0500 (Thu, 14 Oct 2010) | 1 line kill sibling import ........ r85507 | benjamin.peterson | 2010-10-14 17:54:15 -0500 (Thu, 14 Oct 2010) | 1 line remove trailing whitespace ........ r85508 | benjamin.peterson | 2010-10-14 17:55:28 -0500 (Thu, 14 Oct 2010) | 1 line typo ........ ................
104 lines
3.1 KiB
Python
104 lines
3.1 KiB
Python
"""Fixer for it.next() -> next(it), per PEP 3114."""
|
|
# Author: Collin Winter
|
|
|
|
# Things that currently aren't covered:
|
|
# - listcomp "next" names aren't warned
|
|
# - "with" statement targets aren't checked
|
|
|
|
# Local imports
|
|
from ..pgen2 import token
|
|
from ..pygram import python_symbols as syms
|
|
from .. import fixer_base
|
|
from ..fixer_util import Name, Call, find_binding
|
|
|
|
bind_warning = "Calls to builtin next() possibly shadowed by global binding"
|
|
|
|
|
|
class FixNext(fixer_base.BaseFix):
|
|
BM_compatible = True
|
|
PATTERN = """
|
|
power< base=any+ trailer< '.' attr='next' > trailer< '(' ')' > >
|
|
|
|
|
power< head=any+ trailer< '.' attr='next' > not trailer< '(' ')' > >
|
|
|
|
|
classdef< 'class' any+ ':'
|
|
suite< any*
|
|
funcdef< 'def'
|
|
name='next'
|
|
parameters< '(' NAME ')' > any+ >
|
|
any* > >
|
|
|
|
|
global=global_stmt< 'global' any* 'next' any* >
|
|
"""
|
|
|
|
order = "pre" # Pre-order tree traversal
|
|
|
|
def start_tree(self, tree, filename):
|
|
super(FixNext, self).start_tree(tree, filename)
|
|
|
|
n = find_binding('next', tree)
|
|
if n:
|
|
self.warning(n, bind_warning)
|
|
self.shadowed_next = True
|
|
else:
|
|
self.shadowed_next = False
|
|
|
|
def transform(self, node, results):
|
|
assert results
|
|
|
|
base = results.get("base")
|
|
attr = results.get("attr")
|
|
name = results.get("name")
|
|
|
|
if base:
|
|
if self.shadowed_next:
|
|
attr.replace(Name("__next__", prefix=attr.prefix))
|
|
else:
|
|
base = [n.clone() for n in base]
|
|
base[0].prefix = ""
|
|
node.replace(Call(Name("next", prefix=node.prefix), base))
|
|
elif name:
|
|
n = Name("__next__", prefix=name.prefix)
|
|
name.replace(n)
|
|
elif attr:
|
|
# We don't do this transformation if we're assigning to "x.next".
|
|
# Unfortunately, it doesn't seem possible to do this in PATTERN,
|
|
# so it's being done here.
|
|
if is_assign_target(node):
|
|
head = results["head"]
|
|
if "".join([str(n) for n in head]).strip() == '__builtin__':
|
|
self.warning(node, bind_warning)
|
|
return
|
|
attr.replace(Name("__next__"))
|
|
elif "global" in results:
|
|
self.warning(node, bind_warning)
|
|
self.shadowed_next = True
|
|
|
|
|
|
### The following functions help test if node is part of an assignment
|
|
### target.
|
|
|
|
def is_assign_target(node):
|
|
assign = find_assign(node)
|
|
if assign is None:
|
|
return False
|
|
|
|
for child in assign.children:
|
|
if child.type == token.EQUAL:
|
|
return False
|
|
elif is_subtree(child, node):
|
|
return True
|
|
return False
|
|
|
|
def find_assign(node):
|
|
if node.type == syms.expr_stmt:
|
|
return node
|
|
if node.type == syms.simple_stmt or node.parent is None:
|
|
return None
|
|
return find_assign(node.parent)
|
|
|
|
def is_subtree(root, node):
|
|
if root == node:
|
|
return True
|
|
return any(is_subtree(c, node) for c in root.children)
|