From bc21bb3ff76c1e9a7af784c785a1eccbe7f4be1f Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 19 Aug 2008 16:49:39 +0000 Subject: Merged revisions 65855 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ................ r65855 | benjamin.peterson | 2008-08-19 11:41:34 -0500 (Tue, 19 Aug 2008) | 13 lines Merged revisions 65853-65854 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r65853 | benjamin.peterson | 2008-08-19 11:09:09 -0500 (Tue, 19 Aug 2008) | 1 line apply a patch for #3131. this solves the problem for the moment, but we should do some refactoring to get display logic out of RefactoringTool ........ r65854 | benjamin.peterson | 2008-08-19 11:37:38 -0500 (Tue, 19 Aug 2008) | 1 line another quick fix to get lib2to3 to work ........ ................ --- Lib/lib2to3/refactor.py | 8 +++++--- Tools/scripts/2to3 | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index af0b3a8..e4bc2e8 100755 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -172,9 +172,11 @@ class RefactoringTool(object): want a pre-order AST traversal, and post_order is the list that want post-order traversal. """ - fixer_pkg = self.fixer_dir.replace(os.path.sep, ".") - if os.path.altsep: - fixer_pkg = fixer_pkg.replace(os.path.altsep, ".") + if os.path.isabs(self.fixer_dir): + fixer_pkg = os.path.relpath(self.fixer_dir, os.path.join(os.path.dirname(__file__), '..')) + else: + fixer_pkg = self.fixer_dir + fixer_pkg = fixer_pkg.replace(os.path.sep, ".") pre_order_fixers = [] post_order_fixers = [] fix_names = self.options.fix diff --git a/Tools/scripts/2to3 b/Tools/scripts/2to3 index 7578d9d..4fd2cf8 100755 --- a/Tools/scripts/2to3 +++ b/Tools/scripts/2to3 @@ -1,5 +1,7 @@ #!/usr/bin/env python from lib2to3 import refactor import sys +import os -sys.exit(refactor.main("lib2to3/fixes")) +fixers = os.path.join(os.path.dirname(refactor.__file__), "fixes") +sys.exit(refactor.main(fixers)) -- cgit v0.12