Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixs for Phyton 3.9 (#2955)
* change deprecated isAlive() to is_alive()

* remove unsupported keyword "encoding"

Co-authored-by: Lukas1818 <git@lukas1818.de>
  • Loading branch information
LuckyTurtleDev and LuckyTurtleDev committed Feb 19, 2021
1 parent ce98ec4 commit 7f6f613
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion horizons/util/loaders/jsondecoder.py
Expand Up @@ -37,4 +37,4 @@ def _decode_dict(dct):
return newdict

with open(path, "r") as f:
return json.load(f, encoding="ascii", object_hook=_decode_dict)
return json.load(f, object_hook=_decode_dict)
4 changes: 2 additions & 2 deletions horizons/util/preloader.py
Expand Up @@ -79,9 +79,9 @@ def wait_for_finish(self):
"""
self.lock.acquire()
# wait until it finished its current action
if self.isAlive():
if self.is_alive():
self.join()
assert not self.isAlive()
assert not self.is_alive()
else:
try:
self.lock.release()
Expand Down

0 comments on commit 7f6f613

Please sign in to comment.