diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-03 02:27:16 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-03 02:27:16 (GMT) |
| commit | 8951b6172cdfcbc6c14949c4b9fa32908615d49c (patch) | |
| tree | e804813551ee2e18b971d45aeecf214847befbe9 /Tools/scripts/2to3 | |
| parent | d8976f12d4e20ebd6f57e11cbb775a71e35daedd (diff) | |
| download | cpython-8951b6172cdfcbc6c14949c4b9fa32908615d49c.zip cpython-8951b6172cdfcbc6c14949c4b9fa32908615d49c.tar.gz cpython-8951b6172cdfcbc6c14949c4b9fa32908615d49c.tar.bz2 | |
Merged revisions 66174-66175,66177 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r66174 | benjamin.peterson | 2008-09-02 19:21:32 -0500 (Tue, 02 Sep 2008) | 15 lines
Merged revisions 66173 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66173 | benjamin.peterson | 2008-09-02 18:57:48 -0500 (Tue, 02 Sep 2008) | 8 lines
A little 2to3 refactoring #3637
This moves command line logic from refactor.py to a new file called
main.py. RefactoringTool now merely deals with the actual fixers and
refactoring; options processing for example is abstracted out.
This patch was reviewed by Gregory P. Smith.
........
................
r66175 | benjamin.peterson | 2008-09-02 20:53:28 -0500 (Tue, 02 Sep 2008) | 1 line
update 2to3 script from 2to3 trunk
................
r66177 | benjamin.peterson | 2008-09-02 21:14:03 -0500 (Tue, 02 Sep 2008) | 9 lines
Merged revisions 66176 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r66176 | benjamin.peterson | 2008-09-02 21:04:06 -0500 (Tue, 02 Sep 2008) | 1 line
fix typo
........
................
Diffstat (limited to 'Tools/scripts/2to3')
| -rwxr-xr-x | Tools/scripts/2to3 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Tools/scripts/2to3 b/Tools/scripts/2to3 index 4fd2cf8..2a447cf 100755 --- a/Tools/scripts/2to3 +++ b/Tools/scripts/2to3 @@ -1,7 +1,6 @@ #!/usr/bin/env python -from lib2to3 import refactor +from lib2to3.main import main import sys import os -fixers = os.path.join(os.path.dirname(refactor.__file__), "fixes") -sys.exit(refactor.main(fixers)) +sys.exit(main("lib2to3.fixes")) |