From a509032c8e4bbfc5c81c80d44d79660d7eaf060a Mon Sep 17 00:00:00 2001 From: caryoscelus Date: Sat, 29 Jul 2023 18:03:30 +0000 Subject: [PATCH] Drop attempts at py<3.6 compatibility Wake up, it's 2023 now. Also f-strings has been used prominently already --- src/Content/ContentManager.py | 5 +---- src/Db/Db.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Content/ContentManager.py b/src/Content/ContentManager.py index bcf96c0b..a06ba523 100644 --- a/src/Content/ContentManager.py +++ b/src/Content/ContentManager.py @@ -928,10 +928,7 @@ class ContentManager(object): new_content = file else: try: - if sys.version_info.major == 3 and sys.version_info.minor < 6: - new_content = json.loads(file.read().decode("utf8")) - else: - new_content = json.load(file) + new_content = json.load(file) except Exception as err: raise VerifyError(f"Invalid json file: {err}") if inner_path in self.contents: diff --git a/src/Db/Db.py b/src/Db/Db.py index 3d4b6d7d..6ee3a977 100644 --- a/src/Db/Db.py +++ b/src/Db/Db.py @@ -377,10 +377,7 @@ class Db(object): if file_path.endswith("json.gz"): file = helper.limitedGzipFile(fileobj=file) - if sys.version_info.major == 3 and sys.version_info.minor < 6: - data = json.loads(file.read().decode("utf8")) - else: - data = json.load(file) + data = json.load(file) except Exception as err: self.log.debug("Json file %s load error: %s" % (file_path, err)) data = {}