mirror of
https://github.com/python/cpython.git
synced 2025-10-28 04:04:44 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk
................
r67806 | benjamin.peterson | 2008-12-15 21:35:28 -0600 (Mon, 15 Dec 2008) | 111 lines
Merged revisions 67427,67431,67433,67435,67630,67652,67656-67657,67674-67675,67678-67679,67705-67706,67716,67723,67765-67771,67774,67776,67778 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r67427 | benjamin.peterson | 2008-11-28 16:07:41 -0600 (Fri, 28 Nov 2008) | 1 line
fix spelling in comment
........
r67431 | benjamin.peterson | 2008-11-28 17:14:08 -0600 (Fri, 28 Nov 2008) | 1 line
add a scripts directory; move things to it
........
r67433 | benjamin.peterson | 2008-11-28 17:18:48 -0600 (Fri, 28 Nov 2008) | 1 line
run svneol.py
........
r67435 | benjamin.peterson | 2008-11-28 17:25:03 -0600 (Fri, 28 Nov 2008) | 1 line
rename pre/post_order_mapping to pre/post_order_heads
........
r67630 | alexandre.vassalotti | 2008-12-06 21:51:56 -0600 (Sat, 06 Dec 2008) | 2 lines
Fix typo in the urllib2.HTTPDigestAuthHandler fixer.
........
r67652 | armin.ronacher | 2008-12-07 15:39:43 -0600 (Sun, 07 Dec 2008) | 5 lines
Added a fixer that cleans up a tuple argument to isinstance after the tokens
in it were fixed. This is mainly used to remove double occurrences of
tokens as a leftover of the long -> int / unicode -> str conversion.
........
r67656 | armin.ronacher | 2008-12-07 16:54:16 -0600 (Sun, 07 Dec 2008) | 3 lines
Added missing copyright fo 2to3 fix_isinstance.
........
r67657 | armin.ronacher | 2008-12-07 18:29:35 -0600 (Sun, 07 Dec 2008) | 3 lines
2to3: intern and reduce fixes now add the imports if missing. Because that is a common task the fixer_util module now has a function "touch_import" that adds imports if missing.
........
r67674 | benjamin.peterson | 2008-12-08 19:58:11 -0600 (Mon, 08 Dec 2008) | 1 line
copy permission bits when making backup files #4602
........
r67675 | benjamin.peterson | 2008-12-08 19:59:11 -0600 (Mon, 08 Dec 2008) | 1 line
add forgotten import
........
r67678 | benjamin.peterson | 2008-12-08 20:08:30 -0600 (Mon, 08 Dec 2008) | 1 line
fix #4602 for real
........
r67679 | armin.ronacher | 2008-12-09 00:54:03 -0600 (Tue, 09 Dec 2008) | 3 lines
Removed redudant code from the 2to3 long fixer. This fixes #4590.
........
r67705 | benjamin.peterson | 2008-12-11 13:04:08 -0600 (Thu, 11 Dec 2008) | 1 line
put trailers after a range call after the list()
........
r67706 | benjamin.peterson | 2008-12-11 13:17:57 -0600 (Thu, 11 Dec 2008) | 1 line
add html related modules to the fix_imports mapping
........
r67716 | benjamin.peterson | 2008-12-11 22:16:47 -0600 (Thu, 11 Dec 2008) | 1 line
consolidate tests
........
r67723 | benjamin.peterson | 2008-12-12 19:49:31 -0600 (Fri, 12 Dec 2008) | 1 line
fix name
........
r67765 | benjamin.peterson | 2008-12-14 14:05:05 -0600 (Sun, 14 Dec 2008) | 1 line
run fix_isinstance after fix_long and fix_unicode
........
r67766 | benjamin.peterson | 2008-12-14 14:13:05 -0600 (Sun, 14 Dec 2008) | 1 line
use run_order instead of order
........
r67767 | benjamin.peterson | 2008-12-14 14:28:12 -0600 (Sun, 14 Dec 2008) | 1 line
don't retain parenthesis if there is only one item left
........
r67768 | benjamin.peterson | 2008-12-14 14:32:30 -0600 (Sun, 14 Dec 2008) | 1 line
use insert_child()
........
r67769 | benjamin.peterson | 2008-12-14 14:59:10 -0600 (Sun, 14 Dec 2008) | 1 line
parenthesize doesn't belong in pygram or FixerBase
........
r67770 | alexandre.vassalotti | 2008-12-14 15:15:36 -0600 (Sun, 14 Dec 2008) | 2 lines
Fix typo: html.paser -> html.parser.
........
r67771 | benjamin.peterson | 2008-12-14 15:22:09 -0600 (Sun, 14 Dec 2008) | 1 line
altering .children needs to call changed()
........
r67774 | benjamin.peterson | 2008-12-14 15:55:38 -0600 (Sun, 14 Dec 2008) | 1 line
employ an evil hack to fix multiple names in the same import statement
........
r67776 | benjamin.peterson | 2008-12-14 16:22:38 -0600 (Sun, 14 Dec 2008) | 1 line
make a common mixin class for Test_imports and friends
........
r67778 | alexandre.vassalotti | 2008-12-14 17:48:20 -0600 (Sun, 14 Dec 2008) | 2 lines
Make fix_imports refactor multiple imports as.
........
................
178 lines
6.1 KiB
Python
178 lines
6.1 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()
|
|
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.
|
|
|
|
# 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:
|
|
self.pattern = PatternCompiler().compile_pattern(self.PATTERN)
|
|
|
|
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.set_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
|