[Python-checkins] r63886 - in sandbox/trunk/2to3: 2to3 lib2to3/refactor.py lib2to3/tests/test_all_fixers.py lib2to3/tests/test_fixers.py

Mon Jun 2 05:15:02 CEST 2008

Author: collin.winter
Date: Mon Jun 2 05:15:01 2008
New Revision: 63886
Log:
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.
Modified:
 sandbox/trunk/2to3/2to3
 sandbox/trunk/2to3/lib2to3/refactor.py
 sandbox/trunk/2to3/lib2to3/tests/test_all_fixers.py
 sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
Modified: sandbox/trunk/2to3/2to3
==============================================================================

--- sandbox/trunk/2to3/2to3	(original)
+++ sandbox/trunk/2to3/2to3	Mon Jun 2 05:15:01 2008
@@ -2,4 +2,4 @@
 from lib2to3 import refactor
 import sys
 
-sys.exit(refactor.main())
+sys.exit(refactor.main("lib2to3/fixes"))
Modified: sandbox/trunk/2to3/lib2to3/refactor.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/refactor.py	(original)
+++ sandbox/trunk/2to3/lib2to3/refactor.py	Mon Jun 2 05:15:01 2008
@@ -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
Modified: sandbox/trunk/2to3/lib2to3/tests/test_all_fixers.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/tests/test_all_fixers.py	(original)
+++ sandbox/trunk/2to3/lib2to3/tests/test_all_fixers.py	Mon Jun 2 05:15:01 2008
@@ -29,7 +29,7 @@
 def setUp(self):
 options = Options(fix=["all", "idioms", "ws_comma", "buffer"],
 print_function=False)
- self.refactor = refactor.RefactoringTool(options)
+ self.refactor = refactor.RefactoringTool("lib2to3/fixes", options)
 
 def test_all_project_files(self):
 for filepath in support.all_project_files():
Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	(original)
+++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	Mon Jun 2 05:15:01 2008
@@ -30,7 +30,7 @@
 class FixerTestCase(support.TestCase):
 def setUp(self):
 options = Options(fix=[self.fixer], print_function=False)
- self.refactor = refactor.RefactoringTool(options)
+ self.refactor = refactor.RefactoringTool("lib2to3/fixes", options)
 self.fixer_log = []
 self.filename = "<string>"
 
@@ -70,7 +70,7 @@
 fix = [self.fixer]
 fix.extend(names)
 options = Options(fix=fix, print_function=False)
- r = refactor.RefactoringTool(options)
+ r = refactor.RefactoringTool("lib2to3/fixes", options)
 (pre, post) = r.get_fixers()
 n = "fix_" + self.fixer
 if post and post[-1].__class__.__module__.endswith(n):
