mirror of
https://github.com/python/cpython.git
synced 2025-10-31 13:41:24 +00:00
2021100d6d
svn+ssh://pythondev@svn.python.org/python/trunk ................ r76259 | georg.brandl | 2009-11-14 05:50:51 -0600 (Sat, 14 Nov 2009) | 1 line Fix terminology. ................ r76326 | georg.brandl | 2009-11-16 10:44:05 -0600 (Mon, 16 Nov 2009) | 1 line #7302: fix link. ................ r76376 | georg.brandl | 2009-11-18 13:39:14 -0600 (Wed, 18 Nov 2009) | 1 line upcase Python ................ r76377 | georg.brandl | 2009-11-18 14:05:15 -0600 (Wed, 18 Nov 2009) | 1 line Fix markup. ................ r76430 | r.david.murray | 2009-11-20 07:29:43 -0600 (Fri, 20 Nov 2009) | 2 lines Issue 7363: fix indentation in socketserver udpserver example. ................ r76471 | georg.brandl | 2009-11-23 13:53:19 -0600 (Mon, 23 Nov 2009) | 1 line #7345: fix arguments of formatyear(). ................ r76517 | benjamin.peterson | 2009-11-25 12:16:46 -0600 (Wed, 25 Nov 2009) | 29 lines Merged revisions 76160-76161,76250,76252,76447,76506 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r76160 | benjamin.peterson | 2009-11-08 18:53:48 -0600 (Sun, 08 Nov 2009) | 1 line undeprecate the -p option; it's useful for converting python3 sources ........ r76161 | benjamin.peterson | 2009-11-08 19:05:37 -0600 (Sun, 08 Nov 2009) | 1 line simplify condition ........ r76250 | benjamin.peterson | 2009-11-13 16:56:48 -0600 (Fri, 13 Nov 2009) | 1 line fix handling of a utf-8 bom #7313 ........ r76252 | benjamin.peterson | 2009-11-13 16:58:36 -0600 (Fri, 13 Nov 2009) | 1 line remove pdb turd ........ r76447 | benjamin.peterson | 2009-11-22 18:17:40 -0600 (Sun, 22 Nov 2009) | 1 line #7375 fix nested transformations in fix_urllib ........ r76506 | benjamin.peterson | 2009-11-24 18:34:31 -0600 (Tue, 24 Nov 2009) | 1 line use generator expressions in any() ........ ................
102 lines
3.1 KiB
Python
102 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):
|
|
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)
|