Fixed cannot update when using Python3

This commit is contained in:
Kiel committed 2020-05-21 20:56:04 +02:00
1 parent ed57a3aa04
commit a35b348dd9
2 files changed
+4 -8

No files matched your search

+3 -3
View File
@@ -566,11 +566,11 @@ class SpanshRouter():
version_url = "https://raw.githubusercontent.com/CMDR-Kiel42/EDMC_SpanshRouter/master/version.json"
try:
response = requests.get(version_url, timeout=2)
new_version = response.content.decode("utf-8") if type(response.content) == bytes else response.content
if response.status_code == 200:
if self.plugin_version != response.content:
if self.plugin_version != new_version:
self.update_available = True
self.spansh_updater = SpanshUpdater(response.content, self.plugin_dir)
self.spansh_updater = SpanshUpdater(new_version, self.plugin_dir)
else:
sys.stderr.write("Could not query latest SpanshRouter version: " + str(response.status_code) + response.text)
+1 -5
View File
@@ -8,11 +8,7 @@ import json
class SpanshUpdater():
def __init__(self, version, plugin_dir):
self.version = version
is_py2 = sys.version[0] == '2'
if is_py2:
self.zip_name = "EDMC_SpanshRouter_" + version.replace('.', '') + ".zip"
else:
self.zip_name = "EDMC_SpanshRouter_" + version.decode('utf-8') + ".zip"
self.zip_name = "EDMC_SpanshRouter_" + version.replace('.', '') + ".zip"
self.plugin_dir = plugin_dir
self.zip_path = os.path.join(self.plugin_dir, self.zip_name)
self.zip_downloaded = False