Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Replace uses of re.split() with str.split()

Browse Source
This commit is contained in:
Dunedan 2024-08-25 17:08:05 +02:00
parent 24e67746f9
commit 87029f2a91
Signed by untrusted user: Dunedan
GPG Key ID: 885B16854284E0B2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/tools/entity/checkrefs.py
View File

@ -6,7 +6,7 @@ from json import load, loads
from logging import INFO, WARNING, Filter, Formatter, StreamHandler, getLogger from logging import INFO, WARNING, Filter, Formatter, StreamHandler, getLogger
from os.path import basename, exists, sep from os.path import basename, exists, sep
from pathlib import Path from pathlib import Path
from re import match, split from re import match
from struct import calcsize, unpack from struct import calcsize, unpack
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
@ -304,11 +304,10 @@ class CheckRefs:
): ):
if entity.find("Identity") is not None: if entity.find("Identity") is not None:
phenotype_tag = entity.find("Identity").find("Phenotype") phenotype_tag = entity.find("Identity").find("Phenotype")
phenotypes = split( phenotypes = (
r"\s", phenotype_tag.text.split()
phenotype_tag.text if (phenotype_tag is not None and phenotype_tag.text)
if phenotype_tag is not None and phenotype_tag.text else ["default"]
else "default",
) )
actor = entity.find("VisualActor").find("Actor") actor = entity.find("VisualActor").find("Actor")
if "{phenotype}" in actor.text: if "{phenotype}" in actor.text:
@ -325,11 +324,10 @@ class CheckRefs:
self.deps.append((str(fp), f"art/actors/{foundation_actor.text}")) self.deps.append((str(fp), f"art/actors/{foundation_actor.text}"))
if entity.find("Sound") is not None: if entity.find("Sound") is not None:
phenotype_tag = entity.find("Identity").find("Phenotype") phenotype_tag = entity.find("Identity").find("Phenotype")
phenotypes = split( phenotypes = (
r"\s", phenotype_tag.text.split()
phenotype_tag.text if (phenotype_tag is not None and phenotype_tag.text)
if phenotype_tag is not None and phenotype_tag.text else ["default"]
else "default",
) )
lang_tag = entity.find("Identity").find("Lang") lang_tag = entity.find("Identity").find("Lang")
lang = lang_tag.text if lang_tag is not None and lang_tag.text else "greek" lang = lang_tag.text if lang_tag is not None and lang_tag.text else "greek"
@ -386,7 +384,7 @@ class CheckRefs:
cmp_auras = entity.find("Auras") cmp_auras = entity.find("Auras")
if cmp_auras is not None: if cmp_auras is not None:
auraString = cmp_auras.text auraString = cmp_auras.text
for aura in split(r"\s+", auraString): for aura in auraString.split():
if not aura: if not aura:
continue continue
if aura.startswith("-"): if aura.startswith("-"):
@ -421,7 +419,7 @@ class CheckRefs:
if cmp_researcher is not None: if cmp_researcher is not None:
techString = cmp_researcher.find("Technologies") techString = cmp_researcher.find("Technologies")
if techString is not None: if techString is not None:
for tech in split(r"\s+", techString.text): for tech in techString.text.split():
if not tech: if not tech:
continue continue
if tech.startswith("-"): if tech.startswith("-"):