diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-07-25 00:00:39 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 00:00:39 (GMT) |
| commit | 69802f6163c9f18ca0e0b9c4c43a49365fc63e2d (patch) | |
| tree | 0ade0feb717ad08306a49755e06f6e9c607ba201 | |
| parent | 4b7ce105ff80467bf4d79c413d7adc256b824153 (diff) | |
| download | cpython-69802f6163c9f18ca0e0b9c4c43a49365fc63e2d.zip cpython-69802f6163c9f18ca0e0b9c4c43a49365fc63e2d.tar.gz cpython-69802f6163c9f18ca0e0b9c4c43a49365fc63e2d.tar.bz2 | |
closes bpo-37675: Use pkgutil.iter_modules to find fixers in a package rather than listdir. (14942)
(cherry picked from commit 93e8aa62cfd0a61efed4a61a2ffc2283ae986ef2)
Co-authored-by: Benjamin Peterson <benjamin@python.org>
| -rw-r--r-- | Lib/lib2to3/refactor.py | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tools-Demos/2019-07-24-16-20-54.bpo-37675.951Cvf.rst | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 7841b99..55fd60f 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -14,6 +14,7 @@ __author__ = "Guido van Rossum <guido@python.org>" # Python imports import io import os +import pkgutil import sys import logging import operator @@ -30,13 +31,12 @@ from . import btm_matcher as bm def get_all_fix_names(fixer_pkg, remove_prefix=True): """Return a sorted list of all available fix names in the given package.""" pkg = __import__(fixer_pkg, [], [], ["*"]) - fixer_dir = os.path.dirname(pkg.__file__) fix_names = [] - for name in sorted(os.listdir(fixer_dir)): - if name.startswith("fix_") and name.endswith(".py"): + for finder, name, ispkg in pkgutil.iter_modules(pkg.__path__): + if name.startswith("fix_"): if remove_prefix: name = name[4:] - fix_names.append(name[:-3]) + fix_names.append(name) return fix_names diff --git a/Misc/NEWS.d/next/Tools-Demos/2019-07-24-16-20-54.bpo-37675.951Cvf.rst b/Misc/NEWS.d/next/Tools-Demos/2019-07-24-16-20-54.bpo-37675.951Cvf.rst new file mode 100644 index 0000000..e28fa20 --- /dev/null +++ b/Misc/NEWS.d/next/Tools-Demos/2019-07-24-16-20-54.bpo-37675.951Cvf.rst @@ -0,0 +1 @@ +2to3 now works when run from a zipped standard library. |