recipy#155, recipy#98: Moved error handling from find_editor and anno…

…tate get_editor. Removed blank lines in README.md

README.md

@@ -233,6 +233,4 @@ This table lists the modules recipy has patches for, and the input and output fu
 </tbody>
 </table>
 
-
-
 However, the code example above shows how easy it is to write a class to wrap a new module - so please feel free to submit a Pull Request to make recipy work with your favourite scientific modules!

recipyCmd/recipycmd.py

@@ -141,10 +141,8 @@ def main():
 
 
 def annotate(args):
-    # check whether editor is set
+    # get the text editor
     editor = get_editor()
-    if editor is None:
-        raise RuntimeError('No custom editor set in ~/.recipy/recipyrc file and could not find default $EDITOR.')
 
     # Grab latest run from the DB
     run = get_latest_run()

recipyCommon/config.py

@@ -53,6 +53,10 @@ def get_editor():
             editor = '$EDITOR'
         else:
             editor = find_editor()
+    if editor is None or editor is '':
+        raise RuntimeError("Cannot launch text editor. "
+                           "Try setting the editor in the ~/.recipy/recipyrc file")
+
     return editor
 
 
@@ -69,11 +73,7 @@ def find_editor():
     elif "win" in platform:  # windows
         editor = _try_editors(["edit", "notepad", "notepad.exe"])
     else:
-        raise RuntimeError("Cannot launch text editor for operating system %s. "
-                           "Try setting the editor in the ~/.recipy/recipyrc file" % platform)
-    if editor is None:
-        raise RuntimeError("Try setting the editor in the ~/.recipy/recipyrc file")
-
+        editor = None
     return editor