mirror of
				https://github.com/python/cpython.git
				synced 2025-10-31 13:41:24 +00:00 
			
		
		
		
	 3059b00f65
			
		
	
	
		3059b00f65
		
	
	
	
	
		
			
			svn+ssh://pythondev@svn.python.org/python/trunk
................
  r74114 | benjamin.peterson | 2009-07-20 10:33:09 -0500 (Mon, 20 Jul 2009) | 110 lines
  Merged revisions 73771,73811,73840,73842,73848-73849,73861,73957-73960,73964-73969,73972-73974,73977,73981,73984,74065,74113 via svnmerge from
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  ........
    r73771 | benjamin.peterson | 2009-07-02 10:56:55 -0500 (Thu, 02 Jul 2009) | 1 line
    force the imports fixer to be run after the import one #6400
  ........
    r73811 | benjamin.peterson | 2009-07-03 09:03:14 -0500 (Fri, 03 Jul 2009) | 1 line
    check for sep, not pathsep when looking for a subpackage #6408
  ........
    r73840 | benjamin.peterson | 2009-07-04 09:52:28 -0500 (Sat, 04 Jul 2009) | 1 line
    don't print diffs by default; it's annoying
  ........
    r73842 | benjamin.peterson | 2009-07-04 09:58:46 -0500 (Sat, 04 Jul 2009) | 1 line
    complain when not showing diffs or writing
  ........
    r73848 | alexandre.vassalotti | 2009-07-04 23:38:19 -0500 (Sat, 04 Jul 2009) | 2 lines
    Fix test_refactor_stdin to handle print_output() method with 4 arguments.
  ........
    r73849 | alexandre.vassalotti | 2009-07-04 23:43:18 -0500 (Sat, 04 Jul 2009) | 5 lines
    Issue 2370: Add fixer for the removal of operator.isCallable() and
    operator.sequenceIncludes().
    Patch contributed by Jeff Balogh (and updated by me).
  ........
    r73861 | benjamin.peterson | 2009-07-05 09:15:53 -0500 (Sun, 05 Jul 2009) | 1 line
    cleanup and use unicode where appropiate
  ........
    r73957 | benjamin.peterson | 2009-07-11 15:49:56 -0500 (Sat, 11 Jul 2009) | 1 line
    fix calls to str() with unicode()
  ........
    r73958 | benjamin.peterson | 2009-07-11 15:51:51 -0500 (Sat, 11 Jul 2009) | 1 line
    more str() -> unicode()
  ........
    r73959 | benjamin.peterson | 2009-07-11 16:40:08 -0500 (Sat, 11 Jul 2009) | 1 line
    add tests for refactor_dir()
  ........
    r73960 | benjamin.peterson | 2009-07-11 16:44:32 -0500 (Sat, 11 Jul 2009) | 1 line
    don't parse files just because they end with 'py' (no dot)
  ........
    r73964 | benjamin.peterson | 2009-07-11 17:30:15 -0500 (Sat, 11 Jul 2009) | 1 line
    simplify
  ........
    r73965 | benjamin.peterson | 2009-07-11 17:31:30 -0500 (Sat, 11 Jul 2009) | 1 line
    remove usage of get_prefix()
  ........
    r73966 | benjamin.peterson | 2009-07-11 17:33:35 -0500 (Sat, 11 Jul 2009) | 1 line
    revert unintended change in 73965
  ........
    r73967 | benjamin.peterson | 2009-07-11 17:34:44 -0500 (Sat, 11 Jul 2009) | 1 line
    avoid expensive checks and assume the node did change
  ........
    r73968 | benjamin.peterson | 2009-07-11 20:46:46 -0500 (Sat, 11 Jul 2009) | 1 line
    use a regular dict for the heads to avoid adding lists in the loop
  ........
    r73969 | benjamin.peterson | 2009-07-11 20:50:43 -0500 (Sat, 11 Jul 2009) | 1 line
    prefix headnode functions with '_'
  ........
    r73972 | benjamin.peterson | 2009-07-11 21:25:45 -0500 (Sat, 11 Jul 2009) | 1 line
    try to make the head node dict as sparse as possible
  ........
    r73973 | benjamin.peterson | 2009-07-11 21:59:49 -0500 (Sat, 11 Jul 2009) | 1 line
    a better idea; add an option to *not* print diffs
  ........
    r73974 | benjamin.peterson | 2009-07-11 22:00:29 -0500 (Sat, 11 Jul 2009) | 1 line
    add space
  ........
    r73977 | benjamin.peterson | 2009-07-12 10:16:07 -0500 (Sun, 12 Jul 2009) | 1 line
    update get_headnode_dict tests for recent changes
  ........
    r73981 | benjamin.peterson | 2009-07-12 12:06:39 -0500 (Sun, 12 Jul 2009) | 4 lines
    detect when "from __future__ import print_function" is given
    Deprecate the 'print_function' option and the -p flag
  ........
    r73984 | benjamin.peterson | 2009-07-12 16:16:37 -0500 (Sun, 12 Jul 2009) | 1 line
    add tests for Call; thanks Joe Amenta
  ........
    r74065 | benjamin.peterson | 2009-07-17 12:52:49 -0500 (Fri, 17 Jul 2009) | 1 line
    pathname2url and url2pathname are in urllib.request not urllib.parse #6496
  ........
    r74113 | benjamin.peterson | 2009-07-20 08:56:57 -0500 (Mon, 20 Jul 2009) | 1 line
    fix deprecation warnings in tests
  ........
................
		
	
			
		
			
				
	
	
		
			180 lines
		
	
	
	
		
			6.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			180 lines
		
	
	
	
		
			6.2 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.
 | |
|     _accept_type = None # [Advanced and not public] This tells RefactoringTool
 | |
|                         # which node type to accept when there's not a pattern.
 | |
| 
 | |
|     # 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.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
 |