summaryrefslogtreecommitdiffstats
path: root/editor.py
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2020-02-12 14:58:39 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2020-02-12 06:36:22 +0000
commitabdf7500612f1d115863ba8f026ddbea1e5a1f28 (patch)
tree2b87f056bdf4fb53a170fc9121c2f5d1557bb48f /editor.py
parent0ab95ba6d010abe5d615fa070e404582aca1d90a (diff)
downloadgit-repo-abdf7500612f1d115863ba8f026ddbea1e5a1f28.tar.gz
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 <vapier@google.com> Tested-by: David Pursehouse <dpursehouse@collab.net>
Diffstat (limited to 'editor.py')
-rw-r--r--editor.py6
1 files changed, 3 insertions, 3 deletions
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):
57 57
58 if os.getenv('TERM') == 'dumb': 58 if os.getenv('TERM') == 'dumb':
59 print( 59 print(
60"""No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR. 60 """No editor specified in GIT_EDITOR, core.editor, VISUAL or EDITOR.
61Tried to fall back to vi but terminal is dumb. Please configure at 61Tried to fall back to vi but terminal is dumb. Please configure at
62least one of these before using this command.""", file=sys.stderr) 62least one of these before using this command.""", file=sys.stderr)
63 sys.exit(1) 63 sys.exit(1)
@@ -104,10 +104,10 @@ least one of these before using this command.""", file=sys.stderr)
104 rc = subprocess.Popen(args, shell=shell).wait() 104 rc = subprocess.Popen(args, shell=shell).wait()
105 except OSError as e: 105 except OSError as e:
106 raise EditorError('editor failed, %s: %s %s' 106 raise EditorError('editor failed, %s: %s %s'
107 % (str(e), editor, path)) 107 % (str(e), editor, path))
108 if rc != 0: 108 if rc != 0:
109 raise EditorError('editor failed with exit status %d: %s %s' 109 raise EditorError('editor failed with exit status %d: %s %s'
110 % (rc, editor, path)) 110 % (rc, editor, path))
111 111
112 with open(path, mode='rb') as fd2: 112 with open(path, mode='rb') as fd2:
113 return fd2.read().decode('utf-8') 113 return fd2.read().decode('utf-8')