summaryrefslogtreecommitdiff
path: root/paste/httpserver.py
diff options
context:
space:
mode:
authorXtreak <tir.karthi@gmail.com>2020-01-05 19:25:21 +0530
committerChris Dent <cdent@anticdent.org>2020-01-05 13:55:21 +0000
commit7b06a520ba24bec27ae242db92c4ceea22173420 (patch)
tree0c5f9268039d0a464b96ae6506b4e6833a825c7b /paste/httpserver.py
parent104d8ad3f89462dab32c37d0fbdf3c728ffd3223 (diff)
downloadpaste-git-7b06a520ba24bec27ae242db92c4ceea22173420.tar.gz
Fix deprecation warnings (#41)
* Use is_alive instead of isAlive for Python 3.9 compatibility. * Use encodebytes instead of deprecated encodestring. * Fix Python 2 and 3 compatibility for base64.
Diffstat (limited to 'paste/httpserver.py')
-rwxr-xr-xpaste/httpserver.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/paste/httpserver.py b/paste/httpserver.py
index e8d512f..79468f3 100755
--- a/paste/httpserver.py
+++ b/paste/httpserver.py
@@ -952,7 +952,7 @@ class ThreadPool(object):
hung_workers = []
for worker in self.workers:
worker.join(0.5)
- if worker.isAlive():
+ if worker.is_alive():
hung_workers.append(worker)
zombies = []
for thread_id in self.dying_threads:
@@ -969,10 +969,10 @@ class ThreadPool(object):
timed_out = False
need_force_quit = bool(zombies)
for worker in self.workers:
- if not timed_out and worker.isAlive():
+ if not timed_out and worker.is_alive():
timed_out = True
worker.join(force_quit_timeout)
- if worker.isAlive():
+ if worker.is_alive():
print("Worker %s won't die" % worker)
need_force_quit = True
if need_force_quit: