mirror of
https://github.com/python/cpython.git
synced 2025-07-31 07:04:42 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r66887 | benjamin.peterson | 2008-10-13 16:51:40 -0500 (Mon, 13 Oct 2008) | 1 line document how to disable fixers ................ r66891 | amaury.forgeotdarc | 2008-10-14 16:47:22 -0500 (Tue, 14 Oct 2008) | 5 lines #4122: On Windows, Py_UNICODE_ISSPACE cannot be used in an extension module: compilation fails with "undefined reference to _Py_ascii_whitespace" Will backport to 2.6. ................ r66902 | skip.montanaro | 2008-10-15 06:49:10 -0500 (Wed, 15 Oct 2008) | 1 line easter egg ................ r66903 | benjamin.peterson | 2008-10-15 15:34:09 -0500 (Wed, 15 Oct 2008) | 1 line don't recurse into directories that start with '.' ................ r66905 | benjamin.peterson | 2008-10-15 16:05:55 -0500 (Wed, 15 Oct 2008) | 1 line support the optional line argument for idle ................ r66906 | benjamin.peterson | 2008-10-15 16:58:46 -0500 (Wed, 15 Oct 2008) | 1 line add a much requested newline ................ r66911 | benjamin.peterson | 2008-10-15 18:10:28 -0500 (Wed, 15 Oct 2008) | 41 lines Merged revisions 66805,66841,66860,66884-66886,66893,66907,66910 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r66805 | benjamin.peterson | 2008-10-04 20:11:02 -0500 (Sat, 04 Oct 2008) | 1 line mention what the fixes directory is for ........ r66841 | benjamin.peterson | 2008-10-07 17:48:12 -0500 (Tue, 07 Oct 2008) | 1 line use assertFalse and assertTrue ........ r66860 | benjamin.peterson | 2008-10-08 16:05:07 -0500 (Wed, 08 Oct 2008) | 1 line instead of abusing the pattern matcher, use start_tree to find a next binding ........ r66884 | benjamin.peterson | 2008-10-13 15:50:30 -0500 (Mon, 13 Oct 2008) | 1 line don't print tokens to stdout when -v is given ........ r66885 | benjamin.peterson | 2008-10-13 16:28:57 -0500 (Mon, 13 Oct 2008) | 1 line add the -x option to disable fixers ........ r66886 | benjamin.peterson | 2008-10-13 16:33:53 -0500 (Mon, 13 Oct 2008) | 1 line cut down on some crud ........ r66893 | benjamin.peterson | 2008-10-14 17:16:54 -0500 (Tue, 14 Oct 2008) | 1 line add an optional set literal fixer ........ r66907 | benjamin.peterson | 2008-10-15 16:59:41 -0500 (Wed, 15 Oct 2008) | 1 line don't write backup files by default ........ r66910 | benjamin.peterson | 2008-10-15 17:43:10 -0500 (Wed, 15 Oct 2008) | 1 line add the -n option; it stops backupfiles from being written ........ ................ r66912 | hirokazu.yamamoto | 2008-10-16 01:25:25 -0500 (Thu, 16 Oct 2008) | 2 lines removed unused _PyUnicode_FromFileSystemEncodedObject. made win32_chdir, win32_wchdir static. ................ r66913 | benjamin.peterson | 2008-10-16 13:52:14 -0500 (Thu, 16 Oct 2008) | 1 line document that deque indexing is O(n) #4123 ................ r66922 | benjamin.peterson | 2008-10-16 14:40:14 -0500 (Thu, 16 Oct 2008) | 1 line use new showwarnings signature for idle #3391 ................ r66927 | andrew.kuchling | 2008-10-16 15:15:47 -0500 (Thu, 16 Oct 2008) | 1 line Fix wording (2.6.1 backport candidate) ................ r66928 | georg.brandl | 2008-10-16 15:20:56 -0500 (Thu, 16 Oct 2008) | 2 lines Add more TOC to the whatsnew index page. ................ r66936 | georg.brandl | 2008-10-16 16:20:15 -0500 (Thu, 16 Oct 2008) | 2 lines #4131: FF3 doesn't write cookies.txt files. ................ r66939 | georg.brandl | 2008-10-16 16:36:39 -0500 (Thu, 16 Oct 2008) | 2 lines part of #4012: kill off old name "processing". ................ r66940 | georg.brandl | 2008-10-16 16:38:48 -0500 (Thu, 16 Oct 2008) | 2 lines #4083: add "as" to except handler grammar as per PEP 3110. ................ r66962 | benjamin.peterson | 2008-10-17 15:01:01 -0500 (Fri, 17 Oct 2008) | 1 line clarify CALL_FUNCTION #4141 ................ r66964 | georg.brandl | 2008-10-17 16:41:49 -0500 (Fri, 17 Oct 2008) | 2 lines Fix duplicate word. ................ r66973 | armin.ronacher | 2008-10-19 03:27:43 -0500 (Sun, 19 Oct 2008) | 3 lines Fixed #4067 by implementing _attributes and _fields for the AST root node. ................
103 lines
3.1 KiB
Python
103 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, any
|
|
|
|
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")
|
|
mod = results.get("mod")
|
|
|
|
if base:
|
|
if self.shadowed_next:
|
|
attr.replace(Name("__next__", prefix=attr.get_prefix()))
|
|
else:
|
|
base = [n.clone() for n in base]
|
|
base[0].set_prefix("")
|
|
node.replace(Call(Name("next", prefix=node.get_prefix()), base))
|
|
elif name:
|
|
n = Name("__next__", prefix=name.get_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])
|