mirror of
https://github.com/python/cpython.git
synced 2025-07-29 22:24:49 +00:00

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. ........
132 lines
4.8 KiB
Python
132 lines
4.8 KiB
Python
"""
|
|
Main program for 2to3.
|
|
"""
|
|
|
|
import sys
|
|
import os
|
|
import logging
|
|
import shutil
|
|
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, err:
|
|
self.log_message("Can't remove backup %s", backup)
|
|
try:
|
|
os.rename(filename, backup)
|
|
except os.error, 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)
|
|
shutil.copymode(filename, backup)
|
|
|
|
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="2to3 [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 >>sys.stderr, "At least one file or directory argument required."
|
|
print >>sys.stderr, "Use --help to show usage."
|
|
return 2
|
|
if "-" in args:
|
|
refactor_stdin = True
|
|
if options.write:
|
|
print >>sys.stderr, "Can't write to stdin."
|
|
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))
|