Skip to content

Fix deprecation warnings #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cdent merged 3 commits into from
Jan 5, 2020
Merged

Fix deprecation warnings #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7de1dce
Use is_alive instead of isAlive for Python 3.9 compatibility.
tirkarthi Jan 4, 2020
155b5cc
Use encodebytes instead of deprecated encodestring.
tirkarthi Jan 4, 2020
8f9a8e0
Fix Python 2 and 3 compatibility for base64.
tirkarthi Jan 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions paste/auth/cookie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,17 @@ def sign(self, content):
if six.PY3:
content = content.encode('utf8')
timestamp = timestamp.encode('utf8')
cookie = base64.encodestring(
hmac.new(self.secret, content, sha1).digest() +
timestamp +
content)

if six.PY3:
cookie = base64.encodebytes(
hmac.new(self.secret, content, sha1).digest() +
timestamp +
content)
else:
cookie = base64.encodestring(
hmac.new(self.secret, content, sha1).digest() +
timestamp +
content)
cookie = cookie.replace(b"/", b"_").replace(b"=", b"~")
cookie = cookie.replace(b'\n', b'').replace(b'\r', b'')
if len(cookie) > self.maxlen:
Expand Down
6 changes: 3 additions & 3 deletions paste/httpserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@ def shutdown(self, force_quit_timeout=0):
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:
Expand All @@ -969,10 +969,10 @@ def shutdown(self, force_quit_timeout=0):
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:
Expand Down