summaryrefslogtreecommitdiff
path: root/Lib/subprocess.py
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-19 20:49:39 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-08-19 20:49:39 +0300
commitc95678bb155ef9dd2be7109dfce7121f1c58980b (patch)
tree74ff79d7e07d94dfb973f4f6cd77d8495b7ecb87 /Lib/subprocess.py
parentb97a33e2b673056fa1aefeda0f62abf52499a9fd (diff)
downloadcpython-c95678bb155ef9dd2be7109dfce7121f1c58980b.tar.gz
Use Thread.is_alive() instead of old-style Thread.isAlive() in subprocess.
Diffstat (limited to 'Lib/subprocess.py')
-rw-r--r--Lib/subprocess.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index d9f14fa1a0..249b5f6524 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