morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core: Cleanup unneeded use of Version/tuplize_version (#5519)

Browse Source 
* Remove weird version uses

* Restore version var

* Unrestore version var
This commit is contained in:
Duck
2025-10-05 17:56:09 -06:00
committed by GitHub
parent 60617c682e
commit 8dc9719b99
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
worlds/Files.py
View File

@@ -175,12 +175,12 @@ class APWorldContainer(APContainer):
maximum_ap_version: "Version | None" = None
def read_contents(self, opened_zipfile: zipfile.ZipFile) -> Dict[str, Any]:
from Utils import tuplize_version, Version
from Utils import tuplize_version
manifest = super().read_contents(opened_zipfile)
self.game = manifest["game"]
for version_key in ("world_version", "minimum_ap_version", "maximum_ap_version"):
if version_key in manifest:
setattr(self, version_key, Version(*tuplize_version(manifest[version_key])))
setattr(self, version_key, tuplize_version(manifest[version_key]))
return manifest
def get_manifest(self) -> Dict[str, Any]:

3
worlds/__init__.py
View File

@@ -128,8 +128,7 @@ for world_source in world_sources:
break
game = manifest.get("game")
if game in AutoWorldRegister.world_types:
AutoWorldRegister.world_types[game].world_version = Version(*tuplize_version(manifest.get("world_version",
"0.0.0")))
AutoWorldRegister.world_types[game].world_version = tuplize_version(manifest.get("world_version", "0.0.0"))
if apworlds:
# encapsulation for namespace / gc purposes