mirror of
https://github.com/python/cpython.git
synced 2024-12-12 19:33:52 +08: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 ........ ................
190 lines
6.7 KiB
Python
190 lines
6.7 KiB
Python
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
"""Base class for fixers (optional, but recommended)."""
|
|
|
|
# Python imports
|
|
import logging
|
|
import itertools
|
|
|
|
# Local imports
|
|
from .patcomp import PatternCompiler
|
|
from . import pygram
|
|
from .fixer_util import does_tree_import
|
|
|
|
class BaseFix(object):
|
|
|
|
"""Optional base class for fixers.
|
|
|
|
The subclass name must be FixFooBar where FooBar is the result of
|
|
removing underscores and capitalizing the words of the fix name.
|
|
For example, the class name for a fixer named 'has_key' should be
|
|
FixHasKey.
|
|
"""
|
|
|
|
PATTERN = None # Most subclasses should override with a string literal
|
|
pattern = None # Compiled pattern, set by compile_pattern()
|
|
pattern_tree = None # Tree representation of the pattern
|
|
options = None # Options object passed to initializer
|
|
filename = None # The filename (set by set_filename)
|
|
logger = None # A logger (set by set_filename)
|
|
numbers = itertools.count(1) # For new_name()
|
|
used_names = set() # A set of all used NAMEs
|
|
order = "post" # Does the fixer prefer pre- or post-order traversal
|
|
explicit = False # Is this ignored by refactor.py -f all?
|
|
run_order = 5 # Fixers will be sorted by run order before execution
|
|
# Lower numbers will be run first.
|
|
_accept_type = None # [Advanced and not public] This tells RefactoringTool
|
|
# which node type to accept when there's not a pattern.
|
|
|
|
keep_line_order = False # For the bottom matcher: match with the
|
|
# original line order
|
|
BM_compatible = False # Compatibility with the bottom matching
|
|
# module; every fixer should set this
|
|
# manually
|
|
|
|
# Shortcut for access to Python grammar symbols
|
|
syms = pygram.python_symbols
|
|
|
|
def __init__(self, options, log):
|
|
"""Initializer. Subclass may override.
|
|
|
|
Args:
|
|
options: an dict containing the options passed to RefactoringTool
|
|
that could be used to customize the fixer through the command line.
|
|
log: a list to append warnings and other messages to.
|
|
"""
|
|
self.options = options
|
|
self.log = log
|
|
self.compile_pattern()
|
|
|
|
def compile_pattern(self):
|
|
"""Compiles self.PATTERN into self.pattern.
|
|
|
|
Subclass may override if it doesn't want to use
|
|
self.{pattern,PATTERN} in .match().
|
|
"""
|
|
if self.PATTERN is not None:
|
|
PC = PatternCompiler()
|
|
self.pattern, self.pattern_tree = PC.compile_pattern(self.PATTERN,
|
|
with_tree=True)
|
|
|
|
def set_filename(self, filename):
|
|
"""Set the filename, and a logger derived from it.
|
|
|
|
The main refactoring tool should call this.
|
|
"""
|
|
self.filename = filename
|
|
self.logger = logging.getLogger(filename)
|
|
|
|
def match(self, node):
|
|
"""Returns match for a given parse tree node.
|
|
|
|
Should return a true or false object (not necessarily a bool).
|
|
It may return a non-empty dict of matching sub-nodes as
|
|
returned by a matching pattern.
|
|
|
|
Subclass may override.
|
|
"""
|
|
results = {"node": node}
|
|
return self.pattern.match(node, results) and results
|
|
|
|
def transform(self, node, results):
|
|
"""Returns the transformation for a given parse tree node.
|
|
|
|
Args:
|
|
node: the root of the parse tree that matched the fixer.
|
|
results: a dict mapping symbolic names to part of the match.
|
|
|
|
Returns:
|
|
None, or a node that is a modified copy of the
|
|
argument node. The node argument may also be modified in-place to
|
|
effect the same change.
|
|
|
|
Subclass *must* override.
|
|
"""
|
|
raise NotImplementedError()
|
|
|
|
def new_name(self, template="xxx_todo_changeme"):
|
|
"""Return a string suitable for use as an identifier
|
|
|
|
The new name is guaranteed not to conflict with other identifiers.
|
|
"""
|
|
name = template
|
|
while name in self.used_names:
|
|
name = template + str(next(self.numbers))
|
|
self.used_names.add(name)
|
|
return name
|
|
|
|
def log_message(self, message):
|
|
if self.first_log:
|
|
self.first_log = False
|
|
self.log.append("### In file %s ###" % self.filename)
|
|
self.log.append(message)
|
|
|
|
def cannot_convert(self, node, reason=None):
|
|
"""Warn the user that a given chunk of code is not valid Python 3,
|
|
but that it cannot be converted automatically.
|
|
|
|
First argument is the top-level node for the code in question.
|
|
Optional second argument is why it can't be converted.
|
|
"""
|
|
lineno = node.get_lineno()
|
|
for_output = node.clone()
|
|
for_output.prefix = ""
|
|
msg = "Line %d: could not convert: %s"
|
|
self.log_message(msg % (lineno, for_output))
|
|
if reason:
|
|
self.log_message(reason)
|
|
|
|
def warning(self, node, reason):
|
|
"""Used for warning the user about possible uncertainty in the
|
|
translation.
|
|
|
|
First argument is the top-level node for the code in question.
|
|
Optional second argument is why it can't be converted.
|
|
"""
|
|
lineno = node.get_lineno()
|
|
self.log_message("Line %d: %s" % (lineno, reason))
|
|
|
|
def start_tree(self, tree, filename):
|
|
"""Some fixers need to maintain tree-wide state.
|
|
This method is called once, at the start of tree fix-up.
|
|
|
|
tree - the root node of the tree to be processed.
|
|
filename - the name of the file the tree came from.
|
|
"""
|
|
self.used_names = tree.used_names
|
|
self.set_filename(filename)
|
|
self.numbers = itertools.count(1)
|
|
self.first_log = True
|
|
|
|
def finish_tree(self, tree, filename):
|
|
"""Some fixers need to maintain tree-wide state.
|
|
This method is called once, at the conclusion of tree fix-up.
|
|
|
|
tree - the root node of the tree to be processed.
|
|
filename - the name of the file the tree came from.
|
|
"""
|
|
pass
|
|
|
|
|
|
class ConditionalFix(BaseFix):
|
|
""" Base class for fixers which not execute if an import is found. """
|
|
|
|
# This is the name of the import which, if found, will cause the test to be skipped
|
|
skip_on = None
|
|
|
|
def start_tree(self, *args):
|
|
super(ConditionalFix, self).start_tree(*args)
|
|
self._should_skip = None
|
|
|
|
def should_skip(self, node):
|
|
if self._should_skip is not None:
|
|
return self._should_skip
|
|
pkg = self.skip_on.split(".")
|
|
name = pkg[-1]
|
|
pkg = ".".join(pkg[:-1])
|
|
self._should_skip = does_tree_import(pkg, name, node)
|
|
return self._should_skip
|