From b3c5b0cf8d327179ff0ad326de8a43ab114d81a0 Mon Sep 17 00:00:00 2001 From: MinRK Date: Sat, 18 Jun 2011 16:33:36 -0700 Subject: [PATCH] raise PIDFileError on empty PID file, not ValueError in baseapp --- IPython/parallel/apps/baseapp.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/IPython/parallel/apps/baseapp.py b/IPython/parallel/apps/baseapp.py index 0370a848d06..a9458aefd59 100755 --- a/IPython/parallel/apps/baseapp.py +++ b/IPython/parallel/apps/baseapp.py @@ -230,7 +230,11 @@ def get_pid_from_file(self): pid_file = os.path.join(self.profile_dir.pid_dir, self.name + u'.pid') if os.path.isfile(pid_file): with open(pid_file, 'r') as f: - pid = int(f.read().strip()) + s = f.read().strip() + try: + pid = int(s) + except: + raise PIDFileError("invalid pid file: %s (contents: %r)"%(pid_file, s)) return pid else: raise PIDFileError('pid file not found: %s' % pid_file)