Simplify editor selection logic

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/utils.py b/stgit/utils.py
index 00776b021f37ce1b95576b90d4170c355942b842..43366c92a84d4171eac28d3cc054fb5d4d1545c4 100644 (file)
--- a/stgit/utils.py
+++ b/stgit/utils.py
@@ -175,12 +175,8 @@ def call_editor(filename):
 
     # the editor
     editor = config.get('stgit.editor')
 
     # the editor
     editor = config.get('stgit.editor')

-    if editor:
-        pass
-    elif 'EDITOR' in os.environ:
-        editor = os.environ['EDITOR']
-    else:
-        editor = 'vi'
+    if not editor:
+        editor = os.environ.get('EDITOR', 'vi')

     editor += ' %s' % filename
 
     out.start('Invoking the editor: "%s"' % editor)
     editor += ' %s' % filename
 
     out.start('Invoking the editor: "%s"' % editor)