Skip to content

Commit 9a04eee

Browse files
committed
Update autopep8
1 parent da95202 commit 9a04eee

1 file changed

Lines changed: 27 additions & 35 deletions

File tree

‎pylibs/autopep8.py‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -362,23 +362,19 @@ def fix_e123(self, result, logical):
362362
"""The 'loose fingernails' indentation level error for hanging
363363
indents."""
364364
# fix by deleting whitespace to the correct level
365-
modified_lines = self._fix_reindent(result, logical)
366-
if modified_lines:
367-
return modified_lines
368-
else:
369-
# Fallback
370-
if not logical:
371-
return []
372-
logical_lines = logical[2]
373-
line_index = result['line'] - 1
374-
original_line = self.source[line_index]
365+
if not logical:
366+
return []
367+
logical_lines = logical[2]
368+
line_index = result['line'] - 1
369+
original_line = self.source[line_index]
375370

376-
fixed_line = (_get_indentation(logical_lines[0]) +
377-
original_line.lstrip())
378-
if fixed_line == original_line:
379-
return []
380-
else:
381-
self.source[line_index] = fixed_line
371+
fixed_line = (_get_indentation(logical_lines[0]) +
372+
original_line.lstrip())
373+
if fixed_line == original_line:
374+
# Fallback to slower method.
375+
return self._fix_reindent(result, logical)
376+
else:
377+
self.source[line_index] = fixed_line
382378

383379
def fix_e124(self, result, logical):
384380
"""The 'loose fingernails' indentation level error for visual
@@ -401,33 +397,29 @@ def fix_e125(self, result, logical):
401397
def fix_e126(self, result, logical):
402398
"""The 'spectacular indent' error for hanging indents."""
403399
# fix by deleting whitespace to the left
404-
modified_lines = self._fix_reindent(result, logical)
405-
if modified_lines:
406-
return modified_lines
407-
else:
408-
# Fallback
409-
if not logical:
410-
return []
411-
logical_lines = logical[2]
412-
line_index = result['line'] - 1
413-
original = self.source[line_index]
400+
if not logical:
401+
return []
402+
logical_lines = logical[2]
403+
line_index = result['line'] - 1
404+
original = self.source[line_index]
414405

415-
fixed = (_get_indentation(logical_lines[0]) +
416-
self.indent_word + original.lstrip())
417-
if fixed == original:
418-
return []
419-
else:
420-
self.source[line_index] = fixed
406+
fixed = (_get_indentation(logical_lines[0]) +
407+
self.indent_word + original.lstrip())
408+
if fixed == original:
409+
# Fallback to slower method.
410+
return self._fix_reindent(result, logical)
411+
else:
412+
self.source[line_index] = fixed
421413

422414
def fix_e127(self, result, logical):
423415
"""The 'interpretive dance' indentation error."""
424416
# Fix by inserting/deleting whitespace to the correct level.
425-
modified_lines = self._fix_reindent(result, logical)
417+
modified_lines = self._align_visual_indent(result, logical)
426418
if modified_lines:
427419
return modified_lines
428420
else:
429-
# Fallback
430-
return self._align_visual_indent(result, logical)
421+
# Fallback to slower method.
422+
return self._fix_reindent(result, logical)
431423

432424
def _align_visual_indent(self, result, logical):
433425
"""Correct visual indent.

0 commit comments

Comments
 (0)