summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-08-19 16:49:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-08-19 16:49:39 (GMT)
commitbc21bb3ff76c1e9a7af784c785a1eccbe7f4be1f (patch)
treecd469bdabc044ffaf0a3288c1a6ce5e2726d9509 /Tools
parentec99568ce4e9379aff022a2d199c98bd4a3695c5 (diff)
downloadcpython-bc21bb3ff76c1e9a7af784c785a1eccbe7f4be1f.zip
cpython-bc21bb3ff76c1e9a7af784c785a1eccbe7f4be1f.tar.gz
cpython-bc21bb3ff76c1e9a7af784c785a1eccbe7f4be1f.tar.bz2
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 ........ ................
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/2to34
1 files changed, 3 insertions, 1 deletions
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))