From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Sun, 19 Aug 2012 17:49:39 +0000 (+0300)
Subject: Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.
X-Git-Tag: v3.3.0rc1~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=377a152e0dab743b165236024f50602a325d8b93;p=thirdparty%2FPython%2Fcpython.git

Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index d9f14fa1a056..249b5f6524e5 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