From abdf7500612f1d115863ba8f026ddbea1e5a1f28 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 12 Feb 2020 14:58:39 +0900 Subject: Fix indentation issues reported by flake8 - E121 continuation line under-indented for hanging indent - E122 continuation line missing indentation or outdented - E125 continuation line with same indent as next logical line - E126 continuation line over-indented for hanging indent - E127 continuation line over-indented for visual indent - E128 continuation line under-indented for visual indent - E129 visually indented line with same indent as next logical line - E131 continuation line unaligned for hanging indent Fixed automatically with autopep8: git ls-files | grep py$ | xargs autopep8 --in-place \ --select E121,E122,E125,E126,E127,E128,E129,E131 Change-Id: Ifd95fb8e6a1a4d6e9de187b5787d64a6326dd249 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/254605 Reviewed-by: Mike Frysinger Tested-by: David Pursehouse --- editor.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'editor.py') diff --git a/editor.py b/editor.py index fcf16386..6319ada5 100644 --- a/editor.py +++ b/editor.py @@ -57,7 +57,7 @@ class Editor(object): if os.getenv('TERM') == 'dumb': print( -"""No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR. + """No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR. Tried to fall back to vi but terminal is dumb. Please configure at least one of these before using this command.""", file=sys.stderr) sys.exit(1) @@ -104,10 +104,10 @@ least one of these before using this command.""", file=sys.stderr) rc = subprocess.Popen(args, shell=shell).wait() except OSError as e: raise EditorError('editor failed, %s: %s %s' - % (str(e), editor, path)) + % (str(e), editor, path)) if rc != 0: raise EditorError('editor failed with exit status %d: %s %s' - % (rc, editor, path)) + % (rc, editor, path)) with open(path, mode='rb') as fd2: return fd2.read().decode('utf-8') -- cgit v1.2.3-54-g00ecf