summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-17 23:16:28 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-06-17 23:16:28 (GMT)
commit036aa5433e963f6576c5dfa02ace4ca0e2c642a2 (patch)
tree79a9224a52bcea72f9b925efa19750f07934c899
parent68ac331898a6a889077ce74cb153aeac981a81b1 (diff)
downloadcpython-036aa5433e963f6576c5dfa02ace4ca0e2c642a2.zip
cpython-036aa5433e963f6576c5dfa02ace4ca0e2c642a2.tar.gz
cpython-036aa5433e963f6576c5dfa02ace4ca0e2c642a2.tar.bz2
Merged revisions 64360-64361 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64360 | amaury.forgeotdarc | 2008-06-18 01:09:19 +0200 (mer., 18 juin 2008) | 3 lines On windows, lib2to3 should accept / and \ in the fixer_dir argument Needed to let the tests pass ........ r64361 | amaury.forgeotdarc | 2008-06-18 01:14:19 +0200 (mer., 18 juin 2008) | 2 lines Fix the previous fix ........
-rwxr-xr-xLib/lib2to3/refactor.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index 1b8a811..af0b3a8 100755
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -172,7 +172,9 @@ class RefactoringTool(object):
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))
+ fixer_pkg = self.fixer_dir.replace(os.path.sep, ".")
+ if os.path.altsep:
+ fixer_pkg = fixer_pkg.replace(os.path.altsep, ".")
pre_order_fixers = []
post_order_fixers = []
fix_names = self.options.fix