]> granicus.if.org Git - python/commitdiff
Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 19 Aug 2012 17:49:39 +0000 (20:49 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Sun, 19 Aug 2012 17:49:39 +0000 (20:49 +0300)
Lib/subprocess.py

index d9f14fa1a05640ada2b5137f6060cd365890e9c3..249b5f6524e52d443c1b0defd341b417ca40ee6b 100644 (file)
@@ -1188,11 +1188,11 @@ class Popen(object):
             # calls communicate again.
             if self.stdout is not None:
                 self.stdout_thread.join(self._remaining_time(endtime))
-                if self.stdout_thread.isAlive():
+                if self.stdout_thread.is_alive():
                     raise TimeoutExpired(self.args, orig_timeout)
             if self.stderr is not None:
                 self.stderr_thread.join(self._remaining_time(endtime))
-                if self.stderr_thread.isAlive():
+                if self.stderr_thread.is_alive():
                     raise TimeoutExpired(self.args, orig_timeout)
 
             # Collect the output from and close both pipes, now that we know