Skip to content

Commit

Permalink
Fix a wrong exception
Browse files Browse the repository at this point in the history
  • Loading branch information
cynddl committed Jan 5, 2015
1 parent 98421d4 commit 111c38a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion merlin/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def only_ocaml(func):

@functools.wraps(func)
def wrapper(self, view, *args, **kwargs):

if is_ocaml(view):
return func(self, view, *args, **kwargs)

Expand Down
6 changes: 3 additions & 3 deletions merlin/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def restart(self):
stdout=subprocess.PIPE,
stderr=None,
)
except OSError as e:
print("Failed starting ocamlmerlin. Please ensure that ocamlmerlin \
binary is executable.")
except (OSError, FileNotFoundError) as e:
print("Failed starting ocamlmerlin. Please ensure that ocamlmerlin"
"binary is executable.")
raise e

def send_command(self, *cmd):
Expand Down

0 comments on commit 111c38a

Please sign in to comment.