mirror of
https://github.com/python/cpython.git
synced 2025-08-19 16:20:59 +00:00

svn+ssh://pythondev@svn.python.org/python/trunk ................ r66801 | andrew.kuchling | 2008-10-04 23:51:59 +0200 (Sat, 04 Oct 2008) | 1 line Punctuation fix; expand dict.update docstring to be clearer ................ r66803 | benjamin.peterson | 2008-10-05 00:15:31 +0200 (Sun, 05 Oct 2008) | 1 line fix typo ................ r66804 | andrew.kuchling | 2008-10-05 02:11:56 +0200 (Sun, 05 Oct 2008) | 1 line #1415508 from Rocky Bernstein: add docstrings for enable_interspersed_args(), disable_interspersed_args() ................ r66813 | andrew.kuchling | 2008-10-06 14:07:04 +0200 (Mon, 06 Oct 2008) | 3 lines Per Greg Ward, optparse is no longer being externally maintained. I'll look at the bugs in the Optik bug tracker and copy them to the Python bug tracker if they're still relevant. ................ r66854 | georg.brandl | 2008-10-08 19:20:20 +0200 (Wed, 08 Oct 2008) | 2 lines #4059: patch up some sqlite docs. ................ r66855 | georg.brandl | 2008-10-08 19:30:55 +0200 (Wed, 08 Oct 2008) | 2 lines #4058: fix some whatsnew markup. ................ r66856 | georg.brandl | 2008-10-08 20:47:17 +0200 (Wed, 08 Oct 2008) | 3 lines #3935: properly support list subclasses in the C impl. of bisect. Patch reviewed by Raymond. ................ r66866 | benjamin.peterson | 2008-10-09 22:54:43 +0200 (Thu, 09 Oct 2008) | 1 line update paragraph about __future__ for 2.6 ................ r66870 | armin.rigo | 2008-10-10 10:40:44 +0200 (Fri, 10 Oct 2008) | 2 lines Typo: "ThreadError" is the name in the C source. ................ r66871 | benjamin.peterson | 2008-10-10 22:38:49 +0200 (Fri, 10 Oct 2008) | 1 line fix a small typo ................ r66872 | benjamin.peterson | 2008-10-10 22:51:37 +0200 (Fri, 10 Oct 2008) | 1 line talk about how you can unzip with zip ................ r66874 | benjamin.peterson | 2008-10-11 00:23:41 +0200 (Sat, 11 Oct 2008) | 1 line PyGILState_Acquire -> PyGILState_Ensure ................ r66887 | benjamin.peterson | 2008-10-13 23:51:40 +0200 (Mon, 13 Oct 2008) | 1 line document how to disable fixers ................ r66903 | benjamin.peterson | 2008-10-15 22:34:09 +0200 (Wed, 15 Oct 2008) | 1 line don't recurse into directories that start with '.' ................ r66905 | benjamin.peterson | 2008-10-15 23:05:55 +0200 (Wed, 15 Oct 2008) | 1 line support the optional line argument for idle ................ r66911 | benjamin.peterson | 2008-10-16 01:10:28 +0200 (Thu, 16 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 ........ ................ r66913 | benjamin.peterson | 2008-10-16 20:52:14 +0200 (Thu, 16 Oct 2008) | 1 line document that deque indexing is O(n) #4123 ................ r66927 | andrew.kuchling | 2008-10-16 22:15:47 +0200 (Thu, 16 Oct 2008) | 1 line Fix wording (2.6.1 backport candidate) ................ r66932 | benjamin.peterson | 2008-10-16 23:09:28 +0200 (Thu, 16 Oct 2008) | 1 line check for error conditions in _json #3623 ................ r66938 | benjamin.peterson | 2008-10-16 23:27:54 +0200 (Thu, 16 Oct 2008) | 1 line fix possible ref leak ................ r66942 | benjamin.peterson | 2008-10-16 23:48:06 +0200 (Thu, 16 Oct 2008) | 1 line fix more possible ref leaks in _json and use Py_CLEAR ................ r66962 | benjamin.peterson | 2008-10-17 22:01:01 +0200 (Fri, 17 Oct 2008) | 1 line clarify CALL_FUNCTION #4141 ................ r66964 | georg.brandl | 2008-10-17 23:41:49 +0200 (Fri, 17 Oct 2008) | 2 lines Fix duplicate word. ................ r66973 | armin.ronacher | 2008-10-19 10:27:43 +0200 (Sun, 19 Oct 2008) | 3 lines Fixed #4067 by implementing _attributes and _fields for the AST root node. ................ r66974 | benjamin.peterson | 2008-10-19 15:59:01 +0200 (Sun, 19 Oct 2008) | 1 line fix compiler warning ................ r66977 | benjamin.peterson | 2008-10-19 21:39:16 +0200 (Sun, 19 Oct 2008) | 1 line mention -n ................ r66992 | benjamin.peterson | 2008-10-21 22:51:13 +0200 (Tue, 21 Oct 2008) | 1 line make sure to call iteritems() ................ r66998 | benjamin.peterson | 2008-10-22 22:57:43 +0200 (Wed, 22 Oct 2008) | 1 line fix a few typos ................ r66999 | benjamin.peterson | 2008-10-22 23:05:30 +0200 (Wed, 22 Oct 2008) | 1 line and another typo... ................ r67002 | hirokazu.yamamoto | 2008-10-23 02:37:33 +0200 (Thu, 23 Oct 2008) | 1 line Issue #4183: Some tests didn't run with pickle.HIGHEST_PROTOCOL. ................ r67005 | walter.doerwald | 2008-10-23 15:11:39 +0200 (Thu, 23 Oct 2008) | 2 lines Use the correct names of the stateless codec functions (Fixes issue 4178). ................ r67007 | benjamin.peterson | 2008-10-23 23:43:48 +0200 (Thu, 23 Oct 2008) | 1 line only nonempty __slots__ don't work ................ r67028 | benjamin.peterson | 2008-10-26 01:27:07 +0200 (Sun, 26 Oct 2008) | 1 line don't use a catch-all ................ r67040 | armin.rigo | 2008-10-28 18:01:21 +0100 (Tue, 28 Oct 2008) | 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ................ r67041 | benjamin.peterson | 2008-10-29 21:33:00 +0100 (Wed, 29 Oct 2008) | 1 line mention the version gettempdir() was added ................ r67044 | amaury.forgeotdarc | 2008-10-30 00:15:57 +0100 (Thu, 30 Oct 2008) | 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ................ r67070 | benjamin.peterson | 2008-10-31 21:41:44 +0100 (Fri, 31 Oct 2008) | 1 line rephrase has_key doc ................ r67089 | benjamin.peterson | 2008-11-03 21:43:20 +0100 (Mon, 03 Nov 2008) | 1 line clarify by splitting into multiple paragraphs ................ r67091 | benjamin.peterson | 2008-11-03 23:34:57 +0100 (Mon, 03 Nov 2008) | 1 line move a FileIO test to test_fileio ................ r67101 | georg.brandl | 2008-11-04 21:49:35 +0100 (Tue, 04 Nov 2008) | 2 lines #4167: fix markup glitches. ................ r67117 | georg.brandl | 2008-11-06 11:17:58 +0100 (Thu, 06 Nov 2008) | 2 lines #4268: Use correct module for two toplevel functions. ................ r67118 | georg.brandl | 2008-11-06 11:19:11 +0100 (Thu, 06 Nov 2008) | 2 lines #4267: small fixes in sqlite3 docs. ................ r67119 | georg.brandl | 2008-11-06 11:20:49 +0100 (Thu, 06 Nov 2008) | 2 lines #4245: move Thread section to the top. ................ r67123 | georg.brandl | 2008-11-06 19:49:15 +0100 (Thu, 06 Nov 2008) | 2 lines #4247: add "pass" examples to tutorial. ................ r67124 | andrew.kuchling | 2008-11-06 20:23:02 +0100 (Thu, 06 Nov 2008) | 1 line Fix grammar error; reword two paragraphs ................
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, 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)
|
|
|
|
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 >>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))
|