diff options
| -rw-r--r-- | Lib/lib2to3/fixes/fix_urllib.py | 2 | ||||
| -rw-r--r-- | Lib/lib2to3/main.py | 4 | ||||
| -rw-r--r-- | Lib/lib2to3/refactor.py | 5 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_refactor.py | 1 | ||||
| -rw-r--r-- | Lib/lib2to3/tests/test_util.py | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/Lib/lib2to3/fixes/fix_urllib.py b/Lib/lib2to3/fixes/fix_urllib.py index 331e52a..1481cd9 100644 --- a/Lib/lib2to3/fixes/fix_urllib.py +++ b/Lib/lib2to3/fixes/fix_urllib.py @@ -12,7 +12,7 @@ from lib2to3.fixer_util import (Name, Comma, FromImport, Newline, MAPPING = {"urllib": [ ("urllib.request", - ["URLOpener", "FancyURLOpener", "urlretrieve", + ["URLopener", "FancyURLopener", "urlretrieve", "_urlopener", "urlopen", "urlcleanup", "pathname2url", "url2pathname"]), ("urllib.parse", diff --git a/Lib/lib2to3/main.py b/Lib/lib2to3/main.py index 02bae37..20ee434 100644 --- a/Lib/lib2to3/main.py +++ b/Lib/lib2to3/main.py @@ -100,7 +100,7 @@ def main(fixer_pkg, args=None): parser.add_option("-j", "--processes", action="store", default=1, type="int", help="Run 2to3 concurrently") parser.add_option("-x", "--nofix", action="append", default=[], - help="Prevent a fixer from being run.") + help="Prevent a transformation from being run") parser.add_option("-l", "--list-fixes", action="store_true", help="List available transformations") parser.add_option("-p", "--print-function", action="store_true", @@ -112,7 +112,7 @@ def main(fixer_pkg, args=None): parser.add_option("-w", "--write", action="store_true", help="Write back modified files") parser.add_option("-n", "--nobackups", action="store_true", default=False, - help="Don't write backups for modified files.") + help="Don't write backups for modified files") # Parse command line arguments refactor_stdin = False diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 54e00ee..ae5e40f 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -302,13 +302,14 @@ class RefactoringTool(object): Files and subdirectories starting with '.' are skipped. """ + py_ext = os.extsep + "py" for dirpath, dirnames, filenames in os.walk(dir_name): self.log_debug("Descending into %s", dirpath) dirnames.sort() filenames.sort() for name in filenames: - if not name.startswith(".") and \ - os.path.splitext(name)[1].endswith("py"): + if (not name.startswith(".") and + os.path.splitext(name)[1] == py_ext): fullname = os.path.join(dirpath, name) self.refactor_file(fullname, write, doctests_only) # Modify dirnames in-place to remove subdirs with leading dots diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py index 35efe25..73122d8 100644 --- a/Lib/lib2to3/tests/test_refactor.py +++ b/Lib/lib2to3/tests/test_refactor.py @@ -223,6 +223,7 @@ from __future__ import print_function""" "hi.py", ".dumb", ".after.py", + "notpy.npy", "sappy"] expected = ["hi.py"] check(tree, expected) diff --git a/Lib/lib2to3/tests/test_util.py b/Lib/lib2to3/tests/test_util.py index 0ab7537..d2be82c 100644 --- a/Lib/lib2to3/tests/test_util.py +++ b/Lib/lib2to3/tests/test_util.py @@ -568,8 +568,8 @@ class Test_touch_import(support.TestCase): def test_from_import(self): node = parse('bar()') - fixer_util.touch_import("cgi", "escape", node) - self.assertEqual(str(node), 'from cgi import escape\nbar()\n\n') + fixer_util.touch_import("html", "escape", node) + self.assertEqual(str(node), 'from html import escape\nbar()\n\n') def test_name_import(self): node = parse('bar()') |