|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
From cf7a74217558b19aff7c21a724878bcc15dc4e38 Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
From: Zdenek Dohnal <zdohnal@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
Date: Mon, 5 Oct 2020 09:26:40 +0200
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
Subject: [PATCH] isAlive() is removed, use is_alive()
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
---
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
asyncipp.py | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
timedops.py | 4 ++--
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
diff --git a/asyncipp.py b/asyncipp.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
index 5bc160e0..61cd7213 100644
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
--- a/asyncipp.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
+++ b/asyncipp.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
@@ -269,7 +269,7 @@ class IPPConnection:
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
for binding in self.bindings:
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
delattr (self, binding)
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
- if self.thread.isAlive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
+ if self.thread.is_alive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
debugprint ("Stopping worker thread")
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
self.thread.stop ()
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
GLib.timeout_add_seconds (1, self._reap_thread)
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
diff --git a/timedops.py b/timedops.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
index 8a8741c8..111d575f 100644
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
--- a/timedops.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
+++ b/timedops.py
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
@@ -157,7 +157,7 @@ class OperationThread(threading.Thread):
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
self.exception = e
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
def collect_result (self):
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
- if self.isAlive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
+ if self.is_alive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
# We've been canceled.
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
raise OperationCanceled()
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
@@ -212,7 +212,7 @@ class TimedOperation(Timed):
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
return self.thread.collect_result ()
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
def _check_thread (self):
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
- if self.thread.isAlive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
+ if self.thread.is_alive ():
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
# Thread still running.
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
return True
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
--
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
2.26.2
|
|
![](https://seccdn.libravatar.org/avatar/0018fc2b17cf4a22f710625e55459848d0ac8658ccc873f0eb29d6df69b07a81?s=16&d=retro) |
158b07c |
|