From c09f939e15e18c5dab406c3a3f6c721454cfc22c 2017-03-25 20:46:37 From: Thomas Kluyver Date: 2017-03-25 20:46:37 Subject: [PATCH] Merge pull request #10412 from ipython/auto-backport-of-pr-10408 Backport PR #10408 on branch 5.x --- diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py index be8fa94..3fbddc3 100644 --- a/IPython/core/magics/script.py +++ b/IPython/core/magics/script.py @@ -246,6 +246,8 @@ class ScriptMagics(Magics): def kill_bg_processes(self): """Kill all BG processes which are still running.""" + if not self.bg_processes: + return for p in self.bg_processes: if p.poll() is None: try: @@ -253,6 +255,9 @@ class ScriptMagics(Magics): except: pass time.sleep(0.1) + self._gc_bg_processes() + if not self.bg_processes: + return for p in self.bg_processes: if p.poll() is None: try: @@ -260,6 +265,9 @@ class ScriptMagics(Magics): except: pass time.sleep(0.1) + self._gc_bg_processes() + if not self.bg_processes: + return for p in self.bg_processes: if p.poll() is None: try: