Merge pull request #43 from srstevenson/reduce-duplication

Reduce duplication in PtyWithClients.terminate
jupyter · Nov 15, 2017 · ebac2d7 · ebac2d7
2 parents 00f989a + 6ab258b
commit ebac2d7
Showing 1 changed file with 6 additions and 16 deletions.
diff --git a/terminado/management.py b/terminado/management.py
@@ -76,22 +76,12 @@ def terminate(self, force=False):
         if not self.ptyproc.isalive():
             raise gen.Return(True)
         try:
-            self.kill(signal.SIGHUP)
-            yield sleep()
-            if not self.ptyproc.isalive():
-                raise gen.Return(True)
-            self.kill(signal.SIGCONT)
-            yield sleep()
-            if not self.ptyproc.isalive():
-                raise gen.Return(True)
-            self.kill(signal.SIGINT)
-            yield sleep()
-            if not self.ptyproc.isalive():
-                raise gen.Return(True)
-            self.kill(signal.SIGTERM)
-            yield sleep()
-            if not self.ptyproc.isalive():
-                raise gen.Return(True)
+            for sig in [signal.SIGHUP, signal.SIGCONT, signal.SIGINT,
+                        signal.SIGTERM]:
+                self.kill(sig)
+                yield sleep()
+                if not self.ptyproc.isalive():
+                    raise gen.Return(True)
             if force:
                 self.kill(signal.SIGKILL)
                 yield sleep()