2008-03-19 01:43:46 -03:00
|
|
|
"""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
|
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
2008-06-14 23:31:05 -03:00
|
|
|
from .. import fixer_base
|
Merged revisions 67384,67386-67387,67389-67390,67392,67399-67400,67403-67405,67426 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67384 | benjamin.peterson | 2008-11-25 16:13:31 -0600 (Tue, 25 Nov 2008) | 4 lines
don't duplicate calls to start_tree()
RefactoringTool.pre_order values now holds a list of the fixers while pre_order_mapping holds the dict.
........
r67386 | benjamin.peterson | 2008-11-25 16:44:52 -0600 (Tue, 25 Nov 2008) | 1 line
#4423 fix_imports was still replacing usage of a module if attributes were being used
........
r67387 | benjamin.peterson | 2008-11-25 16:47:54 -0600 (Tue, 25 Nov 2008) | 1 line
fix broken test
........
r67389 | benjamin.peterson | 2008-11-25 17:13:17 -0600 (Tue, 25 Nov 2008) | 1 line
remove compatibility code; we only cater to 2.5+
........
r67390 | benjamin.peterson | 2008-11-25 22:03:36 -0600 (Tue, 25 Nov 2008) | 1 line
fix #3994; the usage of changed imports was fixed in nested cases
........
r67392 | benjamin.peterson | 2008-11-26 11:11:40 -0600 (Wed, 26 Nov 2008) | 1 line
simpilfy and comment fix_imports
........
r67399 | benjamin.peterson | 2008-11-26 11:47:03 -0600 (Wed, 26 Nov 2008) | 1 line
remove more compatibility code
........
r67400 | benjamin.peterson | 2008-11-26 12:07:41 -0600 (Wed, 26 Nov 2008) | 1 line
set svn:ignore
........
r67403 | benjamin.peterson | 2008-11-26 13:11:11 -0600 (Wed, 26 Nov 2008) | 1 line
wrap import
........
r67404 | benjamin.peterson | 2008-11-26 13:29:49 -0600 (Wed, 26 Nov 2008) | 1 line
build the fix_imports pattern in compile_pattern, so MAPPING can be changed and reflected in the pattern
........
r67405 | benjamin.peterson | 2008-11-26 14:01:24 -0600 (Wed, 26 Nov 2008) | 1 line
stop ugly messages about runtime errors being from printed
........
r67426 | benjamin.peterson | 2008-11-28 16:01:40 -0600 (Fri, 28 Nov 2008) | 5 lines
don't replace a module name if it is in the middle of a attribute lookup
This fix also stops module names from being replaced if they are not in an attribute lookup.
........
2008-11-28 18:12:14 -04:00
|
|
|
from ..fixer_util import Name, Call, find_binding
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
bind_warning = "Calls to builtin next() possibly shadowed by global binding"
|
|
|
|
|
|
|
|
|
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
2008-06-14 23:31:05 -03:00
|
|
|
class FixNext(fixer_base.BaseFix):
|
2008-03-19 01:43:46 -03:00
|
|
|
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)
|
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
........
2008-10-15 20:10:28 -03:00
|
|
|
|
|
|
|
n = find_binding('next', tree)
|
|
|
|
if n:
|
|
|
|
self.warning(n, bind_warning)
|
|
|
|
self.shadowed_next = True
|
|
|
|
else:
|
|
|
|
self.shadowed_next = False
|
2008-03-19 01:43:46 -03:00
|
|
|
|
|
|
|
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:
|
2008-03-19 02:22:42 -03:00
|
|
|
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))
|
2008-03-19 01:43:46 -03:00
|
|
|
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])
|