From 0491a0e47dd30bf1c849ee29144deeeaacf86845 Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Fri, 22 May 2026 18:42:11 +0800 Subject: [PATCH] Fix: rename to removeprefix --- module/device/pkg_resources/__init__.py | 9 ++++++--- module/game_setting/setting_extractor.py | 4 ++-- module/research/project.py | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/module/device/pkg_resources/__init__.py b/module/device/pkg_resources/__init__.py index b685a6d9a..865afcbd1 100644 --- a/module/device/pkg_resources/__init__.py +++ b/module/device/pkg_resources/__init__.py @@ -25,7 +25,7 @@ except KeyError: logger.error('Patch pkg_resources failed, patch module does not exists') -def remove_suffix(s, suffix): +def removesuffix(s, suffix): """ Remove suffix of a string or bytes like `string.removesuffix(suffix)`, which is on Python3.9+ @@ -36,7 +36,10 @@ def remove_suffix(s, suffix): Returns: str, bytes: """ - return s[:-len(suffix)] if s.endswith(suffix) else s + # s[:-0] is empty string, so we need to check if suffix is empty + if suffix and s.endswith(suffix): + return s[:-len(suffix)] + return s class FakeDistributionObject: @@ -71,7 +74,7 @@ class PackageCache: # adbutils-0.11.0-py3.7.egg-info res = re.match(r'^([a-zA-Z0-9._]+)-([a-zA-Z0-9._]+)-', file) if res: - version = remove_suffix(res.group(2), '.dist') + version = removesuffix(res.group(2), '.dist') # version = res.group(2) obj = FakeDistributionObject( dist=res.group(1), diff --git a/module/game_setting/setting_extractor.py b/module/game_setting/setting_extractor.py index 02759b680..90fa12293 100644 --- a/module/game_setting/setting_extractor.py +++ b/module/game_setting/setting_extractor.py @@ -5,7 +5,7 @@ from dataclasses import dataclass from tqdm import tqdm from module.base.decorator import cached_property -from module.device.method.utils import remove_prefix +from module.device.method.utils import removeprefix REGEX_SETTING = re.compile(r'PlayerPrefs.Get(\w{1,10})\((.*)\)') REGEX_SETTING_KEY = re.compile(r'"(.*?)"') @@ -173,7 +173,7 @@ class SettingExtractor: if not settings: continue yield '' - f = remove_prefix(file, folder).replace("\\", "/") + f = removeprefix(file, folder).replace("\\", "/") yield f' # {f}' for setting in settings: if setting.key in dic_settings: diff --git a/module/research/project.py b/module/research/project.py index 4a92ae1f5..bc6a93e00 100644 --- a/module/research/project.py +++ b/module/research/project.py @@ -4,7 +4,7 @@ from scipy import signal from module.base.decorator import cached_property from module.base.utils import * -from module.device.method.utils import remove_suffix +from module.device.method.utils import removesuffix from module.logger import logger from module.ocr.ocr import Duration, Ocr from module.research.assets import * @@ -364,7 +364,7 @@ def research_jp_detect(image): """ project = ResearchProjectJp() project.series = get_research_series_jp(image) - project.duration = remove_suffix(str(get_research_duration_jp(image) / 3600), '.0') + project.duration = removesuffix(str(get_research_duration_jp(image) / 3600), '.0') if project.duration == '': project.duration = '0' project.genre = get_research_genre_jp(image)