]> granicus.if.org Git - python/commitdiff
Merged revisions 64360-64361 via svnmerge from
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Tue, 17 Jun 2008 23:16:28 +0000 (23:16 +0000)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Tue, 17 Jun 2008 23:16:28 +0000 (23:16 +0000)
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
........

Lib/lib2to3/refactor.py

index 1b8a8113a9c4625989709fd0e85be8e468f0ea87..af0b3a8c206f874d06a7b401a9534ccbea6fc8ea 100755 (executable)
@@ -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