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()
37cdf20cbbac972db64a9dbac9'>commit</a><a class='active' href='/guix/diff/gnu/packages/plotutils.scm?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/plotutils.scm'>
<input type='hidden' name='id' value='6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'/><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/diff/?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>root</a>/<a href='/guix/diff/gnu?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>gnu</a>/<a href='/guix/diff/gnu/packages?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>packages</a>/<a href='/guix/diff/gnu/packages/plotutils.scm?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>plotutils.scm</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/guix/diff/?id=6a2a8ca1f5560c37cdf20cbbac972db64a9dbac9'>Diffstat</a> (limited to 'gnu/packages/plotutils.scm')</div><table summary='diffstat' class='diffstat'></table><div class='diffstat-summary'>0 files changed, 0 insertions, 0 deletions</div><table summary='diff' class='diff'><tr><td></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>