--- subprocess.py.orig	2015-12-24 13:46:34.103994076 -0600
+++ subprocess.py	2015-12-24 13:53:06.074998848 -0600
@@ -537,7 +537,7 @@
     with Popen(*popenargs, **kwargs) as p:
         try:
             return p.wait(timeout=timeout)
-        except:
+        except TimeoutExpired:
             p.kill()
             p.wait()
             raise