mirror of
https://github.com/python/cpython.git
synced 2025-07-28 21:55:21 +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. ................
130 lines
4.7 KiB
Python
130 lines
4.7 KiB
Python
"""
|
|
Main program for 2to3.
|
|
"""
|
|
|
|
import sys
|
|
import os
|
|
import logging
|
|
import optparse
|
|
|
|
from . import refactor
|
|
|
|
|
|
class StdoutRefactoringTool(refactor.RefactoringTool):
|
|
"""
|
|
Prints output to stdout.
|
|
"""
|
|
|
|
def __init__(self, fixers, options, explicit, nobackups):
|
|
self.nobackups = nobackups
|
|
super(StdoutRefactoringTool, self).__init__(fixers, options, explicit)
|
|
|
|
def log_error(self, msg, *args, **kwargs):
|
|
self.errors.append((msg, args, kwargs))
|
|
self.logger.error(msg, *args, **kwargs)
|
|
|
|
def write_file(self, new_text, filename, old_text):
|
|
if not self.nobackups:
|
|
# Make backup
|
|
backup = filename + ".bak"
|
|
if os.path.lexists(backup):
|
|
try:
|
|
os.remove(backup)
|
|
except os.error as err:
|
|
self.log_message("Can't remove backup %s", backup)
|
|
try:
|
|
os.rename(filename, backup)
|
|
except os.error as err:
|
|
self.log_message("Can't rename %s to %s", filename, backup)
|
|
# Actually write the new file
|
|
super(StdoutRefactoringTool, self).write_file(new_text,
|
|
filename, old_text)
|
|
|
|
def print_output(self, lines):
|
|
for line in lines:
|
|
print(line)
|
|
|
|
|
|
def main(fixer_pkg, args=None):
|
|
"""Main program.
|
|
|
|
Args:
|
|
fixer_pkg: the name of a package where the fixers are located.
|
|
args: optional; a list of command line arguments. If omitted,
|
|
sys.argv[1:] is used.
|
|
|
|
Returns a suggested exit status (0, 1, 2).
|
|
"""
|
|
# Set up option parser
|
|
parser = optparse.OptionParser(usage="refactor.py [options] file|dir ...")
|
|
parser.add_option("-d", "--doctests_only", action="store_true",
|
|
help="Fix up doctests only")
|
|
parser.add_option("-f", "--fix", action="append", default=[],
|
|
help="Each FIX specifies a transformation; default: all")
|
|
parser.add_option("-x", "--nofix", action="append", default=[],
|
|
help="Prevent a fixer from being run.")
|
|
parser.add_option("-l", "--list-fixes", action="store_true",
|
|
help="List available transformations (fixes/fix_*.py)")
|
|
parser.add_option("-p", "--print-function", action="store_true",
|
|
help="Modify the grammar so that print() is a function")
|
|
parser.add_option("-v", "--verbose", action="store_true",
|
|
help="More verbose logging")
|
|
parser.add_option("-w", "--write", action="store_true",
|
|
help="Write back modified files")
|
|
parser.add_option("-n", "--nobackups", action="store_true", default=False,
|
|
help="Don't write backups for modified files.")
|
|
|
|
# Parse command line arguments
|
|
refactor_stdin = False
|
|
options, args = parser.parse_args(args)
|
|
if not options.write and options.nobackups:
|
|
parser.error("Can't use -n without -w")
|
|
if options.list_fixes:
|
|
print("Available transformations for the -f/--fix option:")
|
|
for fixname in refactor.get_all_fix_names(fixer_pkg):
|
|
print(fixname)
|
|
if not args:
|
|
return 0
|
|
if not args:
|
|
print("At least one file or directory argument required.", file=sys.stderr)
|
|
print("Use --help to show usage.", file=sys.stderr)
|
|
return 2
|
|
if "-" in args:
|
|
refactor_stdin = True
|
|
if options.write:
|
|
print("Can't write to stdin.", file=sys.stderr)
|
|
return 2
|
|
|
|
# Set up logging handler
|
|
level = logging.DEBUG if options.verbose else logging.INFO
|
|
logging.basicConfig(format='%(name)s: %(message)s', level=level)
|
|
|
|
# Initialize the refactoring tool
|
|
rt_opts = {"print_function" : options.print_function}
|
|
avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
|
|
unwanted_fixes = set(fixer_pkg + ".fix_" + fix for fix in options.nofix)
|
|
explicit = set()
|
|
if options.fix:
|
|
all_present = False
|
|
for fix in options.fix:
|
|
if fix == "all":
|
|
all_present = True
|
|
else:
|
|
explicit.add(fixer_pkg + ".fix_" + fix)
|
|
requested = avail_fixes.union(explicit) if all_present else explicit
|
|
else:
|
|
requested = avail_fixes.union(explicit)
|
|
fixer_names = requested.difference(unwanted_fixes)
|
|
rt = StdoutRefactoringTool(sorted(fixer_names), rt_opts, sorted(explicit),
|
|
options.nobackups)
|
|
|
|
# Refactor all files and directories passed as arguments
|
|
if not rt.errors:
|
|
if refactor_stdin:
|
|
rt.refactor_stdin()
|
|
else:
|
|
rt.refactor(args, options.write, options.doctests_only)
|
|
rt.summarize()
|
|
|
|
# Return error status (0 if rt.errors is zero)
|
|
return int(bool(rt.errors))
|