Skip to content

Commit 143578b

Browse files
committed
Remove -d options from futurize and pasteurize for now
- lib2to3 makes some assumptions in the following line: assert clipped == [u"\n"] * (lineno-1), clipped that would seem to preclude extra __future__ or future.builtins imports. See issue #103.
1 parent 947cb2d commit 143578b

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

libfuturize/main.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ def main(args=None):
100100
help="Report the version number of futurize")
101101
parser.add_option("-a", "--all-imports", action="store_true",
102102
help="Add all __future__ and future imports to each module")
103-
parser.add_option("-d", "--doctests_only", action="store_true",
104-
help="Fix up doctests instead of regular code")
105103
parser.add_option("-1", "--stage1", action="store_true",
106104
help="Modernize Python 2 code only; no compatibility with Python 3 (or dependency on ``future``)")
107105
parser.add_option("-2", "--stage2", action="store_true",
@@ -275,17 +273,6 @@ def main(args=None):
275273
'output_dir': options.output_dir,
276274
'input_base_dir': input_base_dir,
277275
}
278-
# refactor_doctest() in lib2to3/refactor.py has an assert statement
279-
# that dies if it sees a __future__ import. So strip these out.
280-
if options.doctests_only:
281-
print('Warning: due to a limitation in lib2to3, doctests will not '
282-
'include __future__ imports (issue #103)',
283-
file=sys.stderr)
284-
fixer_names -= set(['libfuturize.fixes.fix_print_with_import',
285-
'libfuturize.fixes.fix_absolute_import',
286-
'libfuturize.fixes.fix_division_safe'])
287-
fixer_names |= set(['lib2to3.fixes.fix_print',
288-
'lib2to3.fixes.fix_import'])
289276

290277
rt = StdoutRefactoringTool(
291278
sorted(fixer_names), flags, sorted(explicit),
@@ -298,7 +285,7 @@ def main(args=None):
298285
rt.refactor_stdin()
299286
else:
300287
try:
301-
rt.refactor(args, options.write, options.doctests_only,
288+
rt.refactor(args, options.write, None,
302289
options.processes)
303290
except refactor.MultiprocessingUnsupported:
304291
assert options.processes > 1

libpasteurize/main.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ def main(args=None):
6161
help="Report the version number of pasteurize")
6262
parser.add_option("-a", "--all-imports", action="store_true",
6363
help="Adds all __future__ and future imports to each module")
64-
parser.add_option("-d", "--doctests_only", action="store_true",
65-
help="Fix up doctests only")
6664
parser.add_option("-f", "--fix", action="append", default=[],
6765
help="Each FIX specifies a transformation; default: all")
6866
parser.add_option("-j", "--processes", action="store", default=1,
@@ -139,7 +137,7 @@ def main(args=None):
139137
rt.refactor_stdin()
140138
else:
141139
try:
142-
rt.refactor(args, options.write, options.doctests_only,
140+
rt.refactor(args, options.write, None,
143141
options.processes)
144142
except refactor.MultiprocessingUnsupported:
145143
assert options.processes > 1

0 commit comments

Comments
 (0)