From 7f6f613826aef9810999c1599c8354e8a78fbdb4 Mon Sep 17 00:00:00 2001
From: Lukas1818 <44570204+Lukas1818@users.noreply.github.com>
Date: Fri, 19 Feb 2021 21:08:44 +0100
Subject: [PATCH] fixs for Phyton 3.9 (#2955)

* change deprecated isAlive() to is_alive()

* remove unsupported keyword "encoding"

Co-authored-by: Lukas1818 <git@lukas1818.de>
---
 horizons/util/loaders/jsondecoder.py | 2 +-
 horizons/util/preloader.py           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/horizons/util/loaders/jsondecoder.py b/horizons/util/loaders/jsondecoder.py
index ea2ddfb3308..138a948f42a 100644
--- a/horizons/util/loaders/jsondecoder.py
+++ b/horizons/util/loaders/jsondecoder.py
@@ -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)
diff --git a/horizons/util/preloader.py b/horizons/util/preloader.py
index 5689cc68152..2e072fcc642 100644
--- a/horizons/util/preloader.py
+++ b/horizons/util/preloader.py
@@ -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()
07df04e5d700924edd027ed1e2ef11'>tree</a><a href='/guix/commit/gnu/packages/patches/grub-cross-system-i686.patch?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>commit</a><a href='/guix/diff/gnu/packages/patches/grub-cross-system-i686.patch?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/grub-cross-system-i686.patch'>
<input type='hidden' name='id' value='6a2546f92d07df04e5d700924edd027ed1e2ef11'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>root</a>/<a href='/guix/log/gnu?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>gnu</a>/<a href='/guix/log/gnu/packages?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>patches</a>/<a href='/guix/log/gnu/packages/patches/grub-cross-system-i686.patch?id=6a2546f92d07df04e5d700924edd027ed1e2ef11'>grub-cross-system-i686.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/grub-cross-system-i686.patch?id=6a2546f92d07df04e5d700924edd027ed1e2ef11&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-08 11:23:41 +0200'>2020-07-08</span></td><td><a href='/guix/commit/gnu/packages/patches/grub-cross-system-i686.patch?id=54e70a70f2cb6336b02ed3ac4256f6b44da5c769'>gnu: grub: Fix native compilation of EFI variant on i686-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>This fixes a regression introduce in d613991a8ebe5d4b3a7706f8f0dd52f16fc1c50a
reported on IRC by Mathieu Othacehe &lt;othacehe@gnu.org&gt;.

* gnu/packages/patches/grub-cross-system-i686.patch
[GRUB_MACHINE_EFI &amp;&amp; !__x86_64__]: Add missing .byte alternative to 64-bit
instruction.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2020-06-25 17:46:37 +0200'>2020-06-25</span></td><td><a href='/guix/commit/gnu/packages/patches/grub-cross-system-i686.patch?id=d613991a8ebe5d4b3a7706f8f0dd52f16fc1c50a'>gnu: grub: Cross-build fix for system i686-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/grub-cross-system-i686.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/bootloaders.scm (grub): Use it.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>