Skip to content

Commit 3ca95a1

Browse files
committed
Trim down lists of available fixes (don't search with get_fixers_from_package)
* Also explicitly call our custom fix_imports (which adds "from future * import standard_library)
1 parent 54b15af commit 3ca95a1

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎libfuturize/fixes3/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# 'libfuturize.fixes3.fix_funcattrs',
1919
'libfuturize.fixes3.fix_future_builtins', # adds "from future import *"
2020
'libfuturize.fixes3.fix_getcwd',
21-
# 'libfuturize.fixes3.fix_imports',
21+
'libfuturize.fixes3.fix_imports', # adds "from future import standard_library"
2222
# 'libfuturize.fixes3.fix_imports2',
2323
# 'libfuturize.fixes3.fix_input',
2424
# 'libfuturize.fixes3.fix_int',

‎libfuturize/main.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ def main(args=None):
8282
options, args = parser.parse_args(args)
8383
if options.from3:
8484
fixer_pkg = 'libfuturize.fixes3'
85-
avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
86-
avail_fixes.update(libfuturize_3fix_names)
85+
# avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
86+
# avail_fixes.update(libfuturize_3fix_names)
87+
avail_fixes = libfuturize_3fix_names
8788
flags["print_function"] = True
8889
else:
8990
fixer_pkg = 'libfuturize.fixes2'
90-
avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
91+
# avail_fixes = set(refactor.get_fixers_from_package(fixer_pkg))
92+
avail_fixes = set()
9193
avail_fixes.update(lib2to3_fix_names)
9294
avail_fixes.update(libfuturize_2fix_names)
9395

0 commit comments

Comments
 (0)