From 377a152e0dab743b165236024f50602a325d8b93 Mon Sep 17 00:00:00 2001 From: Andrew Svetlov Date: Sun, 19 Aug 2012 20:49:39 +0300 Subject: Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess. --- Lib/subprocess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py index d9f14fa..249b5f6 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -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 -- cgit v0.12