Merged revisions 64286 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r64286 | benjamin.peterson | 2008-06-14 21:31:05 -0500 (Sat, 14 Jun 2008) | 49 lines
Merged revisions 63661,63666,63695,63711,63729,63769,63790,63880,63886 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r63661 | georg.brandl | 2008-05-26 05:26:20 -0500 (Mon, 26 May 2008) | 2 lines
Add import fixes for dbm package.
........
r63666 | georg.brandl | 2008-05-26 05:49:09 -0500 (Mon, 26 May 2008) | 2 lines
Add xmlrpc package fixes.
........
r63695 | georg.brandl | 2008-05-26 10:14:33 -0500 (Mon, 26 May 2008) | 2 lines
Add fixer entries for http package.
........
r63711 | benjamin.peterson | 2008-05-26 13:43:51 -0500 (Mon, 26 May 2008) | 2 lines
add import mapping for test.test_support -> test.support
........
r63729 | benjamin.peterson | 2008-05-26 16:31:03 -0500 (Mon, 26 May 2008) | 2 lines
mapping for commands module -> subprocess
........
r63769 | brett.cannon | 2008-05-29 00:13:13 -0500 (Thu, 29 May 2008) | 1 line
Fixer for UserString.UserString over to the collections module.
........
r63790 | brett.cannon | 2008-05-29 14:13:51 -0500 (Thu, 29 May 2008) | 4 lines
Add a fixer for UserList.
Closes issue #2878. Thanks to Quentin Gallet-Gilles for the patch.
........
r63880 | collin.winter | 2008-06-01 18:09:38 -0500 (Sun, 01 Jun 2008) | 6 lines
Move lib2to3/fixes/{basefix,util}.py down to lib2to3/.
This is step 1 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects.
........
r63886 | collin.winter | 2008-06-01 22:15:01 -0500 (Sun, 01 Jun 2008) | 5 lines
Allow refactoring tools to specify a directory for fixer modules.
This is step 2 of turning lib2to3/ into a general-purpose refactoring
library, reusable by other projects. Step 1: r63880.
........
................
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index ae9d7d0..1b8a811 100755
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -30,11 +30,13 @@
from . import fixes
from . import pygram
-def main(args=None):
+def main(fixer_dir, args=None):
"""Main program.
- Call without arguments to use sys.argv[1:] as the arguments; or
- call with a list of arguments (excluding sys.argv[0]).
+ Args:
+ fixer_dir: directory where fixer modules 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).
"""
@@ -57,7 +59,7 @@
options, args = parser.parse_args(args)
if options.list_fixes:
print("Available transformations for the -f/--fix option:")
- for fixname in get_all_fix_names():
+ for fixname in get_all_fix_names(fixer_dir):
print(fixname)
if not args:
return 0
@@ -76,7 +78,7 @@
logging.basicConfig(format='%(name)s: %(message)s', level=logging.INFO)
# Initialize the refactoring tool
- rt = RefactoringTool(options)
+ rt = RefactoringTool(fixer_dir, options)
# Refactor all files and directories passed as arguments
if not rt.errors:
@@ -87,10 +89,10 @@
return int(bool(rt.errors))
-def get_all_fix_names():
+def get_all_fix_names(fixer_dir):
"""Return a sorted list of all available fix names."""
fix_names = []
- names = os.listdir(os.path.dirname(fixes.__file__))
+ names = os.listdir(fixer_dir)
names.sort()
for name in names:
if name.startswith("fix_") and name.endswith(".py"):
@@ -138,11 +140,14 @@
class RefactoringTool(object):
- def __init__(self, options):
+ def __init__(self, fixer_dir, options):
"""Initializer.
- The argument is an optparse.Values instance.
+ Args:
+ fixer_dir: directory in which to find fixer modules.
+ options: an optparse.Values instance.
"""
+ self.fixer_dir = fixer_dir
self.options = options
self.errors = []
self.logger = logging.getLogger("RefactoringTool")
@@ -167,14 +172,15 @@
want a pre-order AST traversal, and post_order is the list that want
post-order traversal.
"""
+ fixer_pkg = ".".join(self.fixer_dir.split(os.path.sep))
pre_order_fixers = []
post_order_fixers = []
fix_names = self.options.fix
if not fix_names or "all" in fix_names:
- fix_names = get_all_fix_names()
+ fix_names = get_all_fix_names(self.fixer_dir)
for fix_name in fix_names:
try:
- mod = __import__("lib2to3.fixes.fix_" + fix_name, {}, {}, ["*"])
+ mod = __import__(fixer_pkg + ".fix_" + fix_name, {}, {}, ["*"])
except ImportError:
self.log_error("Can't find transformation %s", fix_name)
continue