From ef64f1559577503b06bef72b23a2b7baedcb78be Mon Sep 17 00:00:00 2001 From: Jennifer Taylor Date: Sat, 27 Jun 2026 03:06:26 +0000 Subject: [PATCH] Move to importing "Final" from typing, type IIDX ghost dictionary, black pass. --- bemani/api/__init__.py | 1 - bemani/api/objects/__init__.py | 1 - bemani/api/types.py | 1 - bemani/backend/__init__.py | 1 - bemani/backend/base.py | 3 +-- bemani/backend/bishi/__init__.py | 1 - bemani/backend/core/__init__.py | 1 - bemani/backend/core/eacoin.py | 2 +- bemani/backend/danevo/__init__.py | 1 - bemani/backend/danevo/base.py | 3 +-- bemani/backend/danevo/danevo.py | 3 +-- bemani/backend/ddr/__init__.py | 1 - bemani/backend/ddr/base.py | 3 +-- bemani/backend/ddr/ddr2013.py | 3 +-- bemani/backend/ddr/ddr2014.py | 3 +-- bemani/backend/ddr/ddrace.py | 3 +-- bemani/backend/ddr/ddrx2.py | 3 +-- bemani/backend/ddr/ddrx3.py | 3 +-- bemani/backend/ess/__init__.py | 1 - bemani/backend/iidx/__init__.py | 1 - bemani/backend/iidx/base.py | 15 +++++++++++---- bemani/backend/iidx/cannonballers.py | 3 +-- bemani/backend/iidx/copula.py | 3 +-- bemani/backend/iidx/course.py | 3 +-- bemani/backend/iidx/pendual.py | 3 +-- bemani/backend/iidx/rootage.py | 3 +-- bemani/backend/iidx/sinobuz.py | 3 +-- bemani/backend/iidx/spada.py | 3 +-- bemani/backend/iidx/tricoro.py | 3 +-- bemani/backend/jubeat/__init__.py | 1 - bemani/backend/jubeat/base.py | 3 +-- bemani/backend/jubeat/clan.py | 3 +-- bemani/backend/jubeat/course.py | 3 +-- bemani/backend/jubeat/festo.py | 3 +-- bemani/backend/jubeat/prop.py | 3 +-- bemani/backend/jubeat/qubell.py | 3 +-- bemani/backend/jubeat/saucerfulfill.py | 3 +-- bemani/backend/mga/__init__.py | 1 - bemani/backend/museca/__init__.py | 1 - bemani/backend/museca/base.py | 3 +-- bemani/backend/museca/museca1.py | 3 +-- bemani/backend/museca/museca1plus.py | 3 +-- bemani/backend/popn/__init__.py | 1 - bemani/backend/popn/base.py | 3 +-- bemani/backend/popn/common.py | 3 +-- bemani/backend/popn/eclale.py | 3 +-- bemani/backend/popn/fantasia.py | 3 +-- bemani/backend/popn/lapistoria.py | 3 +-- bemani/backend/popn/sunnypark.py | 3 +-- bemani/backend/popn/tunestreet.py | 3 +-- bemani/backend/reflec/__init__.py | 1 - bemani/backend/reflec/base.py | 3 +-- bemani/backend/reflec/colette.py | 3 +-- bemani/backend/reflec/groovin.py | 3 +-- bemani/backend/reflec/limelight.py | 3 +-- bemani/backend/reflec/reflecbeat.py | 3 +-- bemani/backend/reflec/volzzabase.py | 3 +-- bemani/backend/sdvx/__init__.py | 1 - bemani/backend/sdvx/base.py | 3 +-- bemani/backend/sdvx/booth.py | 3 +-- bemani/backend/sdvx/gravitywars.py | 3 +-- bemani/backend/sdvx/gravitywars_s2.py | 4 ++-- bemani/backend/sdvx/heavenlyhaven.py | 7 +++---- bemani/backend/sdvx/infiniteinfection.py | 3 +-- bemani/client/__init__.py | 1 - bemani/client/base.py | 3 +-- bemani/client/bishi/__init__.py | 1 - bemani/client/danevo/__init__.py | 1 - bemani/client/ddr/__init__.py | 1 - bemani/client/jubeat/__init__.py | 1 - bemani/client/mga/__init__.py | 1 - bemani/client/museca/__init__.py | 1 - bemani/client/popn/__init__.py | 1 - bemani/client/reflec/__init__.py | 1 - bemani/client/sdvx/__init__.py | 1 - bemani/common/__init__.py | 1 - bemani/common/cache.py | 1 - bemani/common/card.py | 3 +-- bemani/common/constants.py | 3 +-- bemani/common/time.py | 3 +-- bemani/data/__init__.py | 1 - bemani/data/api/client.py | 3 +-- bemani/data/mysql/base.py | 3 +-- bemani/data/mysql/machine.py | 3 +-- bemani/data/mysql/user.py | 3 +-- bemani/format/__init__.py | 1 - bemani/format/afp/__init__.py | 1 - bemani/format/afp/container.py | 4 ++-- bemani/format/afp/decompile.py | 4 ---- bemani/format/afp/swf.py | 3 +-- bemani/format/afp/types/__init__.py | 1 - bemani/format/afp/types/aa.py | 2 +- bemani/format/afp/types/ap2.py | 3 +-- bemani/format/afp/types/expression.py | 3 +-- bemani/format/afp/types/statement.py | 3 +-- bemani/format/arc.py | 6 +++--- bemani/format/ifs.py | 2 +- bemani/format/iidxchart.py | 3 +-- bemani/format/twodx.py | 2 +- bemani/frontend/__init__.py | 1 - bemani/frontend/account/__init__.py | 1 - bemani/frontend/account/account.py | 1 - bemani/frontend/admin/__init__.py | 1 - bemani/frontend/arcade/__init__.py | 1 - bemani/frontend/arcade/arcade.py | 1 - bemani/frontend/bishi/__init__.py | 1 - bemani/frontend/bishi/endpoints.py | 1 - bemani/frontend/danevo/__init__.py | 1 - bemani/frontend/danevo/endpoints.py | 1 - bemani/frontend/ddr/__init__.py | 1 - bemani/frontend/ddr/endpoints.py | 1 - bemani/frontend/home/__init__.py | 1 - bemani/frontend/home/home.py | 1 - bemani/frontend/iidx/__init__.py | 1 - bemani/frontend/jubeat/__init__.py | 1 - bemani/frontend/mga/__init__.py | 1 - bemani/frontend/mga/endpoints.py | 1 - bemani/frontend/museca/__init__.py | 1 - bemani/frontend/museca/endpoints.py | 1 - bemani/frontend/popn/__init__.py | 1 - bemani/frontend/popn/endpoints.py | 1 - bemani/frontend/reflec/__init__.py | 1 - bemani/frontend/reflec/endpoints.py | 4 +--- bemani/frontend/sdvx/__init__.py | 1 - bemani/frontend/sdvx/endpoints.py | 1 - bemani/frontend/types.py | 1 - bemani/protocol/binary.py | 3 +-- bemani/protocol/lz77.py | 4 +--- bemani/protocol/node.py | 3 +-- bemani/protocol/protocol.py | 3 +-- bemani/protocol/xml.py | 3 +-- bemani/sniff/__init__.py | 1 - bemani/sniff/sniff.py | 3 +-- bemani/tests/helpers.py | 1 - bemani/tests/test_afp_decompile.py | 1 - bemani/utils/afputils.py | 16 ++++------------ bemani/utils/jsx.py | 1 - bemani/utils/psmap.py | 4 ++-- bemani/utils/services.py | 1 - bemani/utils/struct.py | 6 ++---- 140 files changed, 97 insertions(+), 234 deletions(-) diff --git a/bemani/api/__init__.py b/bemani/api/__init__.py index 40c01b3..8c97c06 100644 --- a/bemani/api/__init__.py +++ b/bemani/api/__init__.py @@ -1,6 +1,5 @@ from bemani.api.app import app, config - __all__ = [ "app", "config", diff --git a/bemani/api/objects/__init__.py b/bemani/api/objects/__init__.py index 7931ecd..936d857 100644 --- a/bemani/api/objects/__init__.py +++ b/bemani/api/objects/__init__.py @@ -4,7 +4,6 @@ from bemani.api.objects.records import RecordsObject from bemani.api.objects.profile import ProfileObject from bemani.api.objects.statistics import StatisticsObject - __all__ = [ "BaseObject", "CatalogObject", diff --git a/bemani/api/types.py b/bemani/api/types.py index 9bf4936..edc0f91 100644 --- a/bemani/api/types.py +++ b/bemani/api/types.py @@ -1,6 +1,5 @@ from typing import TYPE_CHECKING - if TYPE_CHECKING: from flask.ctx import _AppCtxGlobals diff --git a/bemani/backend/__init__.py b/bemani/backend/__init__.py index a6f1ae0..e744463 100644 --- a/bemani/backend/__init__.py +++ b/bemani/backend/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.dispatch import Dispatch, UnrecognizedPCBIDException from bemani.backend.base import Base - __all__ = [ "Dispatch", "UnrecognizedPCBIDException", diff --git a/bemani/backend/base.py b/bemani/backend/base.py index 2d08c7d..8049b3f 100644 --- a/bemani/backend/base.py +++ b/bemani/backend/base.py @@ -1,7 +1,6 @@ from abc import ABC, abstractmethod import traceback -from typing import Any, Dict, Iterator, List, Optional, Set, Tuple, Type -from typing_extensions import Final +from typing import Any, Dict, Final, Iterator, List, Optional, Set, Tuple, Type from bemani.common import ( Model, diff --git a/bemani/backend/bishi/__init__.py b/bemani/backend/bishi/__init__.py index af5dd73..f529331 100644 --- a/bemani/backend/bishi/__init__.py +++ b/bemani/backend/bishi/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.bishi.factory import BishiBashiFactory from bemani.backend.bishi.base import BishiBashiBase - __all__ = [ "BishiBashiFactory", "BishiBashiBase", diff --git a/bemani/backend/core/__init__.py b/bemani/backend/core/__init__.py index eb956d3..db49dff 100644 --- a/bemani/backend/core/__init__.py +++ b/bemani/backend/core/__init__.py @@ -2,7 +2,6 @@ from bemani.backend.core.core import CoreHandler from bemani.backend.core.cardmng import CardManagerHandler from bemani.backend.core.eacoin import PASELIHandler - __all__ = [ "CoreHandler", "CardManagerHandler", diff --git a/bemani/backend/core/eacoin.py b/bemani/backend/core/eacoin.py index 3fedede..e12f02e 100644 --- a/bemani/backend/core/eacoin.py +++ b/bemani/backend/core/eacoin.py @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final from bemani.backend.base import Base, Status from bemani.protocol import Node diff --git a/bemani/backend/danevo/__init__.py b/bemani/backend/danevo/__init__.py index a51458f..395117f 100644 --- a/bemani/backend/danevo/__init__.py +++ b/bemani/backend/danevo/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.danevo.factory import DanceEvolutionFactory from bemani.backend.danevo.base import DanceEvolutionBase - __all__ = [ "DanceEvolutionFactory", "DanceEvolutionBase", diff --git a/bemani/backend/danevo/base.py b/bemani/backend/danevo/base.py index 19e3a08..766c43c 100644 --- a/bemani/backend/danevo/base.py +++ b/bemani/backend/danevo/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Optional -from typing_extensions import Final +from typing import Final, Optional from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/danevo/danevo.py b/bemani/backend/danevo/danevo.py index a451580..9f76000 100644 --- a/bemani/backend/danevo/danevo.py +++ b/bemani/backend/danevo/danevo.py @@ -1,7 +1,6 @@ import base64 import struct -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.backend.ess import EventLogHandler from bemani.backend.danevo.base import DanceEvolutionBase diff --git a/bemani/backend/ddr/__init__.py b/bemani/backend/ddr/__init__.py index 2a1ce83..3411604 100644 --- a/bemani/backend/ddr/__init__.py +++ b/bemani/backend/ddr/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.ddr.factory import DDRFactory from bemani.backend.ddr.base import DDRBase - __all__ = [ "DDRFactory", "DDRBase", diff --git a/bemani/backend/ddr/base.py b/bemani/backend/ddr/base.py index 5a587e2..021ab4b 100644 --- a/bemani/backend/ddr/base.py +++ b/bemani/backend/ddr/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Optional, List -from typing_extensions import Final +from typing import Final, Optional, List from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/ddr/ddr2013.py b/bemani/backend/ddr/ddr2013.py index 1cd00f8..cc8de16 100644 --- a/bemani/backend/ddr/ddr2013.py +++ b/bemani/backend/ddr/ddr2013.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, List, Optional -from typing_extensions import Final +from typing import Dict, Final, List, Optional from bemani.backend.ddr.base import DDRBase from bemani.backend.ddr.ddrx3 import DDRX3 diff --git a/bemani/backend/ddr/ddr2014.py b/bemani/backend/ddr/ddr2014.py index 19500c1..2f0489e 100644 --- a/bemani/backend/ddr/ddr2014.py +++ b/bemani/backend/ddr/ddr2014.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, List, Optional -from typing_extensions import Final +from typing import Dict, Final, List, Optional from bemani.backend.ddr.base import DDRBase from bemani.backend.ddr.ddr2013 import DDR2013 diff --git a/bemani/backend/ddr/ddrace.py b/bemani/backend/ddr/ddrace.py index c75233a..475d5a4 100644 --- a/bemani/backend/ddr/ddrace.py +++ b/bemani/backend/ddr/ddrace.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import base64 -from typing import Any, Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Tuple from bemani.backend.ess import EventLogHandler from bemani.backend.ddr.base import DDRBase diff --git a/bemani/backend/ddr/ddrx2.py b/bemani/backend/ddr/ddrx2.py index 9b461e7..47a229a 100644 --- a/bemani/backend/ddr/ddrx2.py +++ b/bemani/backend/ddr/ddrx2.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Dict, Final, List, Optional, Tuple from bemani.backend.ddr.base import DDRBase from bemani.backend.ddr.stubs import DDRX diff --git a/bemani/backend/ddr/ddrx3.py b/bemani/backend/ddr/ddrx3.py index e64efb9..a70af73 100644 --- a/bemani/backend/ddr/ddrx3.py +++ b/bemani/backend/ddr/ddrx3.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, List, Optional, Union -from typing_extensions import Final +from typing import Dict, Final, List, Optional, Union from bemani.backend.ddr.base import DDRBase from bemani.backend.ddr.ddrx2 import DDRX2 diff --git a/bemani/backend/ess/__init__.py b/bemani/backend/ess/__init__.py index f504030..7ee17ab 100644 --- a/bemani/backend/ess/__init__.py +++ b/bemani/backend/ess/__init__.py @@ -1,6 +1,5 @@ from bemani.backend.ess.eventlog import EventLogHandler - __all__ = [ "EventLogHandler", ] diff --git a/bemani/backend/iidx/__init__.py b/bemani/backend/iidx/__init__.py index b7873f3..30b5dfa 100644 --- a/bemani/backend/iidx/__init__.py +++ b/bemani/backend/iidx/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.iidx.factory import IIDXFactory from bemani.backend.iidx.base import IIDXBase - __all__ = [ "IIDXFactory", "IIDXBase", diff --git a/bemani/backend/iidx/base.py b/bemani/backend/iidx/base.py index 0f54b38..ab8f59f 100644 --- a/bemani/backend/iidx/base.py +++ b/bemani/backend/iidx/base.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, TypedDict, List, Tuple from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler @@ -17,6 +16,14 @@ from bemani.data import Config, Data, Score, Machine, UserID from bemani.protocol import Node +class GhostDict(TypedDict, total=False): + score: int + ghost: bytes + name: str + pid: int + extid: int + + class IIDXBase(CoreHandler, CardManagerHandler, PASELIHandler, Base): """ Base game class for all Beatmania IIDX versions. Handles common functionality for @@ -660,8 +667,8 @@ class IIDXBase(CoreHandler, CardManagerHandler, PASELIHandler, Base): musicid: int, chart: int, userid: UserID, - ) -> Optional[Dict[str, Any]]: - ghost_score: Dict[str, Any] = None + ) -> Optional[GhostDict]: + ghost_score: Optional[GhostDict] = None if ghost_type == self.GHOST_TYPE_RIVAL: rival_extid = int(parameter) diff --git a/bemani/backend/iidx/cannonballers.py b/bemani/backend/iidx/cannonballers.py index 9f40e0d..4665261 100644 --- a/bemani/backend/iidx/cannonballers.py +++ b/bemani/backend/iidx/cannonballers.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, List, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.course import IIDXCourse diff --git a/bemani/backend/iidx/copula.py b/bemani/backend/iidx/copula.py index 5c0d25f..d61dc85 100644 --- a/bemani/backend/iidx/copula.py +++ b/bemani/backend/iidx/copula.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, List, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.course import IIDXCourse diff --git a/bemani/backend/iidx/course.py b/bemani/backend/iidx/course.py index a7f2f20..1d63a20 100644 --- a/bemani/backend/iidx/course.py +++ b/bemani/backend/iidx/course.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Tuple -from typing_extensions import Final +from typing import Final, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.common import ValidatedDict diff --git a/bemani/backend/iidx/pendual.py b/bemani/backend/iidx/pendual.py index 95ddb6d..e1092d9 100644 --- a/bemani/backend/iidx/pendual.py +++ b/bemani/backend/iidx/pendual.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, List, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.course import IIDXCourse diff --git a/bemani/backend/iidx/rootage.py b/bemani/backend/iidx/rootage.py index 8d110fd..33a44ea 100644 --- a/bemani/backend/iidx/rootage.py +++ b/bemani/backend/iidx/rootage.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, List, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.course import IIDXCourse diff --git a/bemani/backend/iidx/sinobuz.py b/bemani/backend/iidx/sinobuz.py index 692384d..d00a40e 100644 --- a/bemani/backend/iidx/sinobuz.py +++ b/bemani/backend/iidx/sinobuz.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, List, Tuple from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.course import IIDXCourse diff --git a/bemani/backend/iidx/spada.py b/bemani/backend/iidx/spada.py index 23c442f..2cb8503 100644 --- a/bemani/backend/iidx/spada.py +++ b/bemani/backend/iidx/spada.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Final, Optional, Dict, List, Tuple, Any from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.tricoro import IIDXTricoro diff --git a/bemani/backend/iidx/tricoro.py b/bemani/backend/iidx/tricoro.py index c23325a..6cf2208 100644 --- a/bemani/backend/iidx/tricoro.py +++ b/bemani/backend/iidx/tricoro.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import random -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Final, Optional, Dict, List, Tuple, Any from bemani.backend.iidx.base import IIDXBase from bemani.backend.iidx.stubs import IIDXLincle diff --git a/bemani/backend/jubeat/__init__.py b/bemani/backend/jubeat/__init__.py index f38b1ba..c868e26 100644 --- a/bemani/backend/jubeat/__init__.py +++ b/bemani/backend/jubeat/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.jubeat.factory import JubeatFactory from bemani.backend.jubeat.base import JubeatBase - __all__ = [ "JubeatFactory", "JubeatBase", diff --git a/bemani/backend/jubeat/base.py b/bemani/backend/jubeat/base.py index 69a590d..38345b3 100644 --- a/bemani/backend/jubeat/base.py +++ b/bemani/backend/jubeat/base.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import random import struct -from typing import Dict, Iterable, List, Optional, Set, Tuple -from typing_extensions import Final +from typing import Dict, Final, Iterable, List, Optional, Set, Tuple from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/jubeat/clan.py b/bemani/backend/jubeat/clan.py index 3fb518d..457be8a 100644 --- a/bemani/backend/jubeat/clan.py +++ b/bemani/backend/jubeat/clan.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import random -from typing import Any, Dict, List, Optional, Set, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Set, Tuple from bemani.backend.jubeat.base import JubeatBase from bemani.backend.jubeat.common import ( diff --git a/bemani/backend/jubeat/course.py b/bemani/backend/jubeat/course.py index c6bb027..0a8dbaa 100644 --- a/bemani/backend/jubeat/course.py +++ b/bemani/backend/jubeat/course.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.data import UserID from bemani.backend.jubeat.base import JubeatBase diff --git a/bemani/backend/jubeat/festo.py b/bemani/backend/jubeat/festo.py index 77085d2..353101c 100644 --- a/bemani/backend/jubeat/festo.py +++ b/bemani/backend/jubeat/festo.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import random -from typing import Any, Dict, List, Optional, Set, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Set, Tuple from bemani.backend.jubeat.base import JubeatBase from bemani.backend.jubeat.common import ( diff --git a/bemani/backend/jubeat/prop.py b/bemani/backend/jubeat/prop.py index 7c321f0..b6546eb 100644 --- a/bemani/backend/jubeat/prop.py +++ b/bemani/backend/jubeat/prop.py @@ -1,8 +1,7 @@ # vim: set fileencoding=utf-8 import math import random -from typing import Optional, Dict, List, Any, Set, Tuple -from typing_extensions import Final +from typing import Optional, Dict, Final, List, Any, Set, Tuple from bemani.backend.base import Status from bemani.backend.jubeat.common import ( diff --git a/bemani/backend/jubeat/qubell.py b/bemani/backend/jubeat/qubell.py index 2b2dd2f..442b2b6 100644 --- a/bemani/backend/jubeat/qubell.py +++ b/bemani/backend/jubeat/qubell.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import random -from typing import Any, Dict, List, Optional, Set, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Set, Tuple from bemani.backend.base import Status from bemani.backend.jubeat.base import JubeatBase diff --git a/bemani/backend/jubeat/saucerfulfill.py b/bemani/backend/jubeat/saucerfulfill.py index 4a839e8..32feb83 100644 --- a/bemani/backend/jubeat/saucerfulfill.py +++ b/bemani/backend/jubeat/saucerfulfill.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import random -from typing import Any, Dict, List, Optional, Set, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Set, Tuple from bemani.backend.base import Status from bemani.backend.jubeat.base import JubeatBase diff --git a/bemani/backend/mga/__init__.py b/bemani/backend/mga/__init__.py index 1290899..d0ab42b 100644 --- a/bemani/backend/mga/__init__.py +++ b/bemani/backend/mga/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.mga.factory import MetalGearArcadeFactory from bemani.backend.mga.base import MetalGearArcadeBase - __all__ = [ "MetalGearArcadeFactory", "MetalGearArcadeBase", diff --git a/bemani/backend/museca/__init__.py b/bemani/backend/museca/__init__.py index d36dd99..cede79f 100644 --- a/bemani/backend/museca/__init__.py +++ b/bemani/backend/museca/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.museca.factory import MusecaFactory from bemani.backend.museca.base import MusecaBase - __all__ = [ "MusecaFactory", "MusecaBase", diff --git a/bemani/backend/museca/base.py b/bemani/backend/museca/base.py index 0b71dcf..d9e7b84 100644 --- a/bemani/backend/museca/base.py +++ b/bemani/backend/museca/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, Optional -from typing_extensions import Final +from typing import Dict, Final, Optional from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/museca/museca1.py b/bemani/backend/museca/museca1.py index 653f1f1..71c9d9b 100644 --- a/bemani/backend/museca/museca1.py +++ b/bemani/backend/museca/museca1.py @@ -1,5 +1,4 @@ -from typing import Any, Dict -from typing_extensions import Final +from typing import Any, Dict, Final from bemani.backend.ess import EventLogHandler from bemani.backend.museca.base import MusecaBase diff --git a/bemani/backend/museca/museca1plus.py b/bemani/backend/museca/museca1plus.py index f7dc418..2c092cb 100644 --- a/bemani/backend/museca/museca1plus.py +++ b/bemani/backend/museca/museca1plus.py @@ -1,5 +1,4 @@ -from typing import Optional, Dict, Any -from typing_extensions import Final +from typing import Optional, Final, Dict, Any from bemani.backend.ess import EventLogHandler from bemani.backend.museca.base import MusecaBase diff --git a/bemani/backend/popn/__init__.py b/bemani/backend/popn/__init__.py index 7b0f845..258f5b6 100644 --- a/bemani/backend/popn/__init__.py +++ b/bemani/backend/popn/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.popn.factory import PopnMusicFactory from bemani.backend.popn.base import PopnMusicBase - __all__ = [ "PopnMusicFactory", "PopnMusicBase", diff --git a/bemani/backend/popn/base.py b/bemani/backend/popn/base.py index 5876106..2097e84 100644 --- a/bemani/backend/popn/base.py +++ b/bemani/backend/popn/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, Optional, Sequence -from typing_extensions import Final +from typing import Dict, Final, Optional, Sequence from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/popn/common.py b/bemani/backend/popn/common.py index a34d123..a9aca38 100644 --- a/bemani/backend/popn/common.py +++ b/bemani/backend/popn/common.py @@ -2,8 +2,7 @@ from abc import ABC, abstractmethod import binascii import random -from typing import Any, Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Tuple from bemani.backend.popn.base import PopnMusicBase from bemani.common import Time, ID, Profile, ValidatedDict, Parallel diff --git a/bemani/backend/popn/eclale.py b/bemani/backend/popn/eclale.py index 3529186..f532fbd 100644 --- a/bemani/backend/popn/eclale.py +++ b/bemani/backend/popn/eclale.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import binascii -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.backend.popn.base import PopnMusicBase from bemani.backend.popn.lapistoria import PopnMusicLapistoria diff --git a/bemani/backend/popn/fantasia.py b/bemani/backend/popn/fantasia.py index 9ad1aa3..038d706 100644 --- a/bemani/backend/popn/fantasia.py +++ b/bemani/backend/popn/fantasia.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.backend.popn.base import PopnMusicBase from bemani.backend.popn.tunestreet import PopnMusicTuneStreet diff --git a/bemani/backend/popn/lapistoria.py b/bemani/backend/popn/lapistoria.py index 4d779a7..8353375 100644 --- a/bemani/backend/popn/lapistoria.py +++ b/bemani/backend/popn/lapistoria.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.backend.popn.base import PopnMusicBase from bemani.backend.popn.sunnypark import PopnMusicSunnyPark diff --git a/bemani/backend/popn/sunnypark.py b/bemani/backend/popn/sunnypark.py index 27a4018..9f21cd2 100644 --- a/bemani/backend/popn/sunnypark.py +++ b/bemani/backend/popn/sunnypark.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from bemani.backend.popn.base import PopnMusicBase from bemani.backend.popn.fantasia import PopnMusicFantasia diff --git a/bemani/backend/popn/tunestreet.py b/bemani/backend/popn/tunestreet.py index 78e419c..3d112e4 100644 --- a/bemani/backend/popn/tunestreet.py +++ b/bemani/backend/popn/tunestreet.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, Any -from typing_extensions import Final +from typing import Final, Dict, Any from bemani.backend.popn.base import PopnMusicBase from bemani.backend.popn.stubs import PopnMusicSengokuRetsuden diff --git a/bemani/backend/reflec/__init__.py b/bemani/backend/reflec/__init__.py index 69662c0..d9d7480 100644 --- a/bemani/backend/reflec/__init__.py +++ b/bemani/backend/reflec/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.reflec.factory import ReflecBeatFactory from bemani.backend.reflec.base import ReflecBeatBase - __all__ = [ "ReflecBeatFactory", "ReflecBeatBase", diff --git a/bemani/backend/reflec/base.py b/bemani/backend/reflec/base.py index 1c48db5..2c8a126 100644 --- a/bemani/backend/reflec/base.py +++ b/bemani/backend/reflec/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, List, Optional -from typing_extensions import Final +from typing import Dict, Final, List, Optional from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/reflec/colette.py b/bemani/backend/reflec/colette.py index 625227f..d2a0e89 100644 --- a/bemani/backend/reflec/colette.py +++ b/bemani/backend/reflec/colette.py @@ -1,5 +1,4 @@ -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Optional, Dict, Final, List, Tuple, Any from bemani.backend.reflec.base import ReflecBeatBase from bemani.backend.reflec.limelight import ReflecBeatLimelight diff --git a/bemani/backend/reflec/groovin.py b/bemani/backend/reflec/groovin.py index 97f18ff..4167c34 100644 --- a/bemani/backend/reflec/groovin.py +++ b/bemani/backend/reflec/groovin.py @@ -1,5 +1,4 @@ -from typing import Optional, Dict, Any, List, Tuple -from typing_extensions import Final +from typing import Optional, Dict, Final, Any, List, Tuple from bemani.backend.reflec.base import ReflecBeatBase from bemani.backend.reflec.colette import ReflecBeatColette diff --git a/bemani/backend/reflec/limelight.py b/bemani/backend/reflec/limelight.py index f868b6f..ba2effe 100644 --- a/bemani/backend/reflec/limelight.py +++ b/bemani/backend/reflec/limelight.py @@ -1,5 +1,4 @@ -from typing import Optional, Dict, Any, Tuple -from typing_extensions import Final +from typing import Final, Optional, Dict, Any, Tuple from bemani.backend.reflec.base import ReflecBeatBase from bemani.backend.reflec.reflecbeat import ReflecBeat diff --git a/bemani/backend/reflec/reflecbeat.py b/bemani/backend/reflec/reflecbeat.py index 35e0a00..6da1a78 100644 --- a/bemani/backend/reflec/reflecbeat.py +++ b/bemani/backend/reflec/reflecbeat.py @@ -1,5 +1,4 @@ -from typing import Any, Dict, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, Tuple from bemani.backend.reflec.base import ReflecBeatBase diff --git a/bemani/backend/reflec/volzzabase.py b/bemani/backend/reflec/volzzabase.py index af294bd..cad12a8 100644 --- a/bemani/backend/reflec/volzzabase.py +++ b/bemani/backend/reflec/volzzabase.py @@ -1,5 +1,4 @@ -from typing import Dict, List, Tuple -from typing_extensions import Final +from typing import Dict, Final, List, Tuple from bemani.backend.reflec.base import ReflecBeatBase diff --git a/bemani/backend/sdvx/__init__.py b/bemani/backend/sdvx/__init__.py index 5625eba..8b9efdf 100644 --- a/bemani/backend/sdvx/__init__.py +++ b/bemani/backend/sdvx/__init__.py @@ -1,7 +1,6 @@ from bemani.backend.sdvx.factory import SoundVoltexFactory from bemani.backend.sdvx.base import SoundVoltexBase - __all__ = [ "SoundVoltexFactory", "SoundVoltexBase", diff --git a/bemani/backend/sdvx/base.py b/bemani/backend/sdvx/base.py index 2d5ecef..497a05f 100644 --- a/bemani/backend/sdvx/base.py +++ b/bemani/backend/sdvx/base.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Dict, Optional -from typing_extensions import Final +from typing import Dict, Final, Optional from bemani.backend.base import Base from bemani.backend.core import CoreHandler, CardManagerHandler, PASELIHandler diff --git a/bemani/backend/sdvx/booth.py b/bemani/backend/sdvx/booth.py index aecf55c..e90dc3f 100644 --- a/bemani/backend/sdvx/booth.py +++ b/bemani/backend/sdvx/booth.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, Optional, Tuple from bemani.backend.ess import EventLogHandler from bemani.backend.sdvx.base import SoundVoltexBase diff --git a/bemani/backend/sdvx/gravitywars.py b/bemani/backend/sdvx/gravitywars.py index a8ea150..527e398 100644 --- a/bemani/backend/sdvx/gravitywars.py +++ b/bemani/backend/sdvx/gravitywars.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List, Optional -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional from bemani.backend.ess import EventLogHandler from bemani.backend.sdvx.base import SoundVoltexBase diff --git a/bemani/backend/sdvx/gravitywars_s2.py b/bemani/backend/sdvx/gravitywars_s2.py index e0e0a14..ae4d06a 100644 --- a/bemani/backend/sdvx/gravitywars_s2.py +++ b/bemani/backend/sdvx/gravitywars_s2.py @@ -3885,7 +3885,7 @@ class SoundVoltexGravityWarsSeason2( game.add_child(highscores) for musicid in records: for chart in records[musicid]: - (globaluserid, globalscore) = records[musicid][chart]["global"] + globaluserid, globalscore = records[musicid][chart]["global"] global_profile = users[globaluserid] if clears[musicid][chart]["total"] > 0: @@ -3903,7 +3903,7 @@ class SoundVoltexGravityWarsSeason2( info.add_child(Node.s32("cr", int(clear_rate * 10000))) if "area" in records[musicid][chart]: - (localuserid, localscore) = records[musicid][chart]["area"] + localuserid, localscore = records[musicid][chart]["area"] local_profile = users[localuserid] info.add_child(Node.string("l_sq", ID.format_extid(local_profile.extid))) info.add_child(Node.string("l_nm", local_profile.get_str("name"))) diff --git a/bemani/backend/sdvx/heavenlyhaven.py b/bemani/backend/sdvx/heavenlyhaven.py index 8047142..d1ffad9 100644 --- a/bemani/backend/sdvx/heavenlyhaven.py +++ b/bemani/backend/sdvx/heavenlyhaven.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Tuple from bemani.backend.ess import EventLogHandler from bemani.backend.sdvx.base import SoundVoltexBase @@ -3479,7 +3478,7 @@ class SoundVoltexHeavenlyHaven( game.add_child(highscores) for musicid in records: for chart in records[musicid]: - (globaluserid, globalscore) = records[musicid][chart]["global"] + globaluserid, globalscore = records[musicid][chart]["global"] global_profile = users[globaluserid] if clears[musicid][chart]["total"] > 0: @@ -3498,7 +3497,7 @@ class SoundVoltexHeavenlyHaven( info.add_child(Node.s32("avg_sc", clears[musicid][chart]["average"])) if "area" in records[musicid][chart]: - (localuserid, localscore) = records[musicid][chart]["area"] + localuserid, localscore = records[musicid][chart]["area"] local_profile = users[localuserid] info.add_child(Node.string("l_sq", ID.format_extid(local_profile.extid))) info.add_child(Node.string("l_nm", local_profile.get_str("name"))) diff --git a/bemani/backend/sdvx/infiniteinfection.py b/bemani/backend/sdvx/infiniteinfection.py index 3a4704d..e46b9f3 100644 --- a/bemani/backend/sdvx/infiniteinfection.py +++ b/bemani/backend/sdvx/infiniteinfection.py @@ -1,6 +1,5 @@ # vim: set fileencoding=utf-8 -from typing import Any, Dict, List, Optional -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional from bemani.backend.ess import EventLogHandler from bemani.backend.sdvx.base import SoundVoltexBase diff --git a/bemani/client/__init__.py b/bemani/client/__init__.py index 23f9e62..9ccfb8f 100644 --- a/bemani/client/__init__.py +++ b/bemani/client/__init__.py @@ -1,7 +1,6 @@ from bemani.client.base import BaseClient from bemani.client.protocol import ClientProtocol - __all__ = [ "BaseClient", "ClientProtocol", diff --git a/bemani/client/base.py b/bemani/client/base.py index 543f975..038d8e2 100644 --- a/bemani/client/base.py +++ b/bemani/client/base.py @@ -1,6 +1,5 @@ import time -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Optional, Dict, Final, List, Tuple, Any from bemani.client.common import random_hex_string from bemani.client.protocol import ClientProtocol diff --git a/bemani/client/bishi/__init__.py b/bemani/client/bishi/__init__.py index fd7ade0..58da6ea 100644 --- a/bemani/client/bishi/__init__.py +++ b/bemani/client/bishi/__init__.py @@ -1,6 +1,5 @@ from bemani.client.bishi.bishi import TheStarBishiBashiClient - __all__ = [ "TheStarBishiBashiClient", ] diff --git a/bemani/client/danevo/__init__.py b/bemani/client/danevo/__init__.py index ad13788..1cc82db 100644 --- a/bemani/client/danevo/__init__.py +++ b/bemani/client/danevo/__init__.py @@ -1,6 +1,5 @@ from bemani.client.danevo.danevo import DanceEvolutionClient - __all__ = [ "DanceEvolutionClient", ] diff --git a/bemani/client/ddr/__init__.py b/bemani/client/ddr/__init__.py index 51bd462..6d5dbc9 100644 --- a/bemani/client/ddr/__init__.py +++ b/bemani/client/ddr/__init__.py @@ -4,7 +4,6 @@ from bemani.client.ddr.ddr2013 import DDR2013Client from bemani.client.ddr.ddr2014 import DDR2014Client from bemani.client.ddr.ddrace import DDRAceClient - __all__ = [ "DDRX2Client", "DDRX3Client", diff --git a/bemani/client/jubeat/__init__.py b/bemani/client/jubeat/__init__.py index edc27cb..89bbe43 100644 --- a/bemani/client/jubeat/__init__.py +++ b/bemani/client/jubeat/__init__.py @@ -5,7 +5,6 @@ from bemani.client.jubeat.qubell import JubeatQubellClient from bemani.client.jubeat.clan import JubeatClanClient from bemani.client.jubeat.festo import JubeatFestoClient - __all__ = [ "JubeatSaucerClient", "JubeatSaucerFulfillClient", diff --git a/bemani/client/mga/__init__.py b/bemani/client/mga/__init__.py index 86fba31..28a7ba0 100644 --- a/bemani/client/mga/__init__.py +++ b/bemani/client/mga/__init__.py @@ -1,6 +1,5 @@ from bemani.client.mga.mga import MetalGearArcadeClient - __all__ = [ "MetalGearArcadeClient", ] diff --git a/bemani/client/museca/__init__.py b/bemani/client/museca/__init__.py index 2c4e10f..008c51c 100644 --- a/bemani/client/museca/__init__.py +++ b/bemani/client/museca/__init__.py @@ -1,7 +1,6 @@ from bemani.client.museca.museca1 import Museca1Client from bemani.client.museca.museca1plus import Museca1PlusClient - __all__ = [ "Museca1Client", "Museca1PlusClient", diff --git a/bemani/client/popn/__init__.py b/bemani/client/popn/__init__.py index 67dc4f9..05802ad 100644 --- a/bemani/client/popn/__init__.py +++ b/bemani/client/popn/__init__.py @@ -8,7 +8,6 @@ from bemani.client.popn.peace import PopnMusicPeaceClient from bemani.client.popn.kaimei import PopnMusicKaimeiClient from bemani.client.popn.unilab import PopnMusicUnilabClient - __all__ = [ "PopnMusicTuneStreetClient", "PopnMusicFantasiaClient", diff --git a/bemani/client/reflec/__init__.py b/bemani/client/reflec/__init__.py index 95bee0a..2a3480c 100644 --- a/bemani/client/reflec/__init__.py +++ b/bemani/client/reflec/__init__.py @@ -5,7 +5,6 @@ from bemani.client.reflec.groovin import ReflecBeatGroovinUpper from bemani.client.reflec.volzza import ReflecBeatVolzza from bemani.client.reflec.volzza2 import ReflecBeatVolzza2 - __all__ = [ "ReflecBeat", "ReflecBeatLimelight", diff --git a/bemani/client/sdvx/__init__.py b/bemani/client/sdvx/__init__.py index b151898..e18846d 100644 --- a/bemani/client/sdvx/__init__.py +++ b/bemani/client/sdvx/__init__.py @@ -4,7 +4,6 @@ from bemani.client.sdvx.gravitywars_s1 import SoundVoltexGravityWarsS1Client from bemani.client.sdvx.gravitywars_s2 import SoundVoltexGravityWarsS2Client from bemani.client.sdvx.heavenlyhaven import SoundVoltexHeavenlyHavenClient - __all__ = [ "SoundVoltexBoothClient", "SoundVoltexInfiniteInfectionClient", diff --git a/bemani/common/__init__.py b/bemani/common/__init__.py index 9179196..f71c8aa 100644 --- a/bemani/common/__init__.py +++ b/bemani/common/__init__.py @@ -17,7 +17,6 @@ from bemani.common.parallel import Parallel from bemani.common.pe import PEFile, InvalidOffsetException from bemani.common.cache import cache - __all__ = [ "Model", "ValidatedDict", diff --git a/bemani/common/cache.py b/bemani/common/cache.py index 1f61509..e4e8769 100644 --- a/bemani/common/cache.py +++ b/bemani/common/cache.py @@ -1,7 +1,6 @@ from flask import Flask from flask_caching import Cache - # This somewhat breaks convention of trying to keep flask stuff in only the application # routing layer, but flask-caching itself is a useful wrapper that supports a ton of # backends like in-memory, filesystem, redis, memcached, etc. So, we centralize the diff --git a/bemani/common/card.py b/bemani/common/card.py index bc00faa..73febe6 100644 --- a/bemani/common/card.py +++ b/bemani/common/card.py @@ -1,5 +1,4 @@ -from typing import Dict, List -from typing_extensions import Final +from typing import Dict, Final, List from Crypto.Cipher import DES3 diff --git a/bemani/common/constants.py b/bemani/common/constants.py index 8ede862..a60e6b4 100644 --- a/bemani/common/constants.py +++ b/bemani/common/constants.py @@ -1,6 +1,5 @@ from enum import Enum -from typing import Dict -from typing_extensions import Final +from typing import Dict, Final class GameConstants(Enum): diff --git a/bemani/common/time.py b/bemani/common/time.py index f30178b..dafb876 100644 --- a/bemani/common/time.py +++ b/bemani/common/time.py @@ -2,8 +2,7 @@ import calendar import datetime from dateutil import tz -from typing import List, Optional -from typing_extensions import Final +from typing import Final, List, Optional class Time: diff --git a/bemani/data/__init__.py b/bemani/data/__init__.py index 77e70d3..3910eed 100644 --- a/bemani/data/__init__.py +++ b/bemani/data/__init__.py @@ -20,7 +20,6 @@ from bemani.data.types import ( from bemani.data.remoteuser import RemoteUser from bemani.data.triggers import Triggers - __all__ = [ "Config", "Data", diff --git a/bemani/data/api/client.py b/bemani/data/api/client.py index db970dd..1a1e74b 100644 --- a/bemani/data/api/client.py +++ b/bemani/data/api/client.py @@ -1,7 +1,6 @@ import json import requests -from typing import Tuple, Dict, List, Any, Optional -from typing_extensions import Final +from typing import Tuple, Dict, Final, List, Any, Optional from bemani.common import ( APIConstants, diff --git a/bemani/data/mysql/base.py b/bemani/data/mysql/base.py index 1ca2fff..2be91f9 100644 --- a/bemani/data/mysql/base.py +++ b/bemani/data/mysql/base.py @@ -1,7 +1,6 @@ import json import random -from typing import Dict, Any, Optional -from typing_extensions import Final +from typing import Final, Dict, Any, Optional from bemani.common import Time from bemani.data.config import Config diff --git a/bemani/data/mysql/machine.py b/bemani/data/mysql/machine.py index cf58216..a51c060 100644 --- a/bemani/data/mysql/machine.py +++ b/bemani/data/mysql/machine.py @@ -1,8 +1,7 @@ from sqlalchemy import Table, Column, UniqueConstraint from sqlalchemy.types import String, Integer, JSON from sqlalchemy.dialects.mysql import BIGINT as BigInteger -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Optional, Dict, Final, List, Tuple, Any from bemani.common import GameConstants, ValidatedDict from bemani.data.mysql.base import BaseData, metadata diff --git a/bemani/data/mysql/user.py b/bemani/data/mysql/user.py index 54cd529..a2d956d 100644 --- a/bemani/data/mysql/user.py +++ b/bemani/data/mysql/user.py @@ -3,8 +3,7 @@ from sqlalchemy import Table, Column, UniqueConstraint from sqlalchemy.types import String, Integer, JSON from sqlalchemy.dialects.mysql import BIGINT as BigInteger from sqlalchemy.exc import IntegrityError -from typing import Optional, Dict, List, Tuple, Any -from typing_extensions import Final +from typing import Final, Optional, Dict, List, Tuple, Any from passlib.hash import pbkdf2_sha512 # type: ignore from bemani.common import ValidatedDict, Profile, GameConstants, Time diff --git a/bemani/format/__init__.py b/bemani/format/__init__.py index 4bae4a4..2591ec6 100644 --- a/bemani/format/__init__.py +++ b/bemani/format/__init__.py @@ -5,7 +5,6 @@ from bemani.format.tdxt import TDXT from bemani.format.iidxchart import IIDXChart from bemani.format.iidxmusicdb import IIDXMusicDB, IIDXSong - __all__ = [ "IFS", "ARC", diff --git a/bemani/format/afp/__init__.py b/bemani/format/afp/__init__.py index b9bde36..c1732d2 100644 --- a/bemani/format/afp/__init__.py +++ b/bemani/format/afp/__init__.py @@ -32,7 +32,6 @@ from .types import ( ) from .decompile import ByteCode, ByteCodeDecompiler - __all__ = [ "Shape", "DrawParams", diff --git a/bemani/format/afp/container.py b/bemani/format/afp/container.py index f9a8901..bf28e43 100644 --- a/bemani/format/afp/container.py +++ b/bemani/format/afp/container.py @@ -407,7 +407,7 @@ class TXP2File(TrackedCoverage, VerboseOutput): while i < 8 and len(decomp) < decomp_len: if (control & 0x01) != 0: if comp_i >= comp_len: - return decomp + return bytes(decomp) decomp.append(comp[comp_i]) window[window_i] = comp[comp_i] @@ -432,7 +432,7 @@ class TXP2File(TrackedCoverage, VerboseOutput): slide_len -= 1 control >>= 1 i += 1 - return decomp + return bytes(decomp) def __parse(self, verbose: bool) -> None: # First, check the signature diff --git a/bemani/format/afp/decompile.py b/bemani/format/afp/decompile.py index c5d790b..d2affa0 100644 --- a/bemani/format/afp/decompile.py +++ b/bemani/format/afp/decompile.py @@ -4023,10 +4023,6 @@ class ByteCodeDecompiler(VerboseOutput): if new_batch[i] is not cur_statement: raise Exception("Logic error!") - if not isinstance(cur_statement, IfStatement): - # This isn't even an if statement. We should never hit - # this but the type checker wants to be happy. - return statement if has_break(cur_statement.true_statements) or has_break(cur_statement.false_statements): # This code already uses a 'break' statement. If we stuck it # in a switch, it would change the sematics of this statement diff --git a/bemani/format/afp/swf.py b/bemani/format/afp/swf.py index 5ee8e6e..32fd91b 100644 --- a/bemani/format/afp/swf.py +++ b/bemani/format/afp/swf.py @@ -1,8 +1,7 @@ import os import struct import sys -from typing import Any, Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Tuple from .decompile import ByteCode from .types import ( diff --git a/bemani/format/afp/types/__init__.py b/bemani/format/afp/types/__init__.py index bb5e407..e27e308 100644 --- a/bemani/format/afp/types/__init__.py +++ b/bemani/format/afp/types/__init__.py @@ -89,7 +89,6 @@ from .statement import ( ) from .aa import AAMode - __all__ = [ "Matrix", "Color", diff --git a/bemani/format/afp/types/aa.py b/bemani/format/afp/types/aa.py index e34217d..d9a4028 100644 --- a/bemani/format/afp/types/aa.py +++ b/bemani/format/afp/types/aa.py @@ -1,4 +1,4 @@ -from typing_extensions import Final +from typing import Final class AAMode: diff --git a/bemani/format/afp/types/ap2.py b/bemani/format/afp/types/ap2.py index 5e1a40a..c9e4f65 100644 --- a/bemani/format/afp/types/ap2.py +++ b/bemani/format/afp/types/ap2.py @@ -1,6 +1,5 @@ import os -from typing import TYPE_CHECKING, Any, Dict, List, Set, Optional -from typing_extensions import Final +from typing import TYPE_CHECKING, Any, Dict, Final, List, Set, Optional from .expression import Register diff --git a/bemani/format/afp/types/expression.py b/bemani/format/afp/types/expression.py index c84c6de..e5622d8 100644 --- a/bemani/format/afp/types/expression.py +++ b/bemani/format/afp/types/expression.py @@ -1,6 +1,5 @@ import os -from typing import TYPE_CHECKING, Any, Dict, List, Tuple, Optional, Union -from typing_extensions import Final +from typing import TYPE_CHECKING, Any, Dict, Final, List, Tuple, Optional, Union if TYPE_CHECKING: # Circular import otherwise diff --git a/bemani/format/afp/types/statement.py b/bemani/format/afp/types/statement.py index 6c70070..71b0664 100644 --- a/bemani/format/afp/types/statement.py +++ b/bemani/format/afp/types/statement.py @@ -1,6 +1,5 @@ import os -from typing import Any, List, Optional, Sequence, Union -from typing_extensions import Final +from typing import Any, Final, List, Optional, Sequence, Union from .expression import ( Expression, diff --git a/bemani/format/arc.py b/bemani/format/arc.py index f47181f..da3c83f 100644 --- a/bemani/format/arc.py +++ b/bemani/format/arc.py @@ -23,12 +23,12 @@ class ARC: raise Exception("Unknown file format!") # Grab header offsets - (_, numfiles, _) = struct.unpack(" bytes: - (fileoffset, uncompressedsize, compressedsize) = self.__files[filename] + fileoffset, uncompressedsize, compressedsize = self.__files[filename] if compressedsize == uncompressedsize: # Just stored diff --git a/bemani/format/ifs.py b/bemani/format/ifs.py index d32f799..dd841cd 100644 --- a/bemani/format/ifs.py +++ b/bemani/format/ifs.py @@ -133,7 +133,7 @@ class IFS: otherdata: Dict[str, IFS] = {} for fn in files: - (start, size, pack_time, external_file) = files[fn] + start, size, pack_time, external_file = files[fn] if external_file is not None: if external_file not in otherdata: if self.__loader is None: diff --git a/bemani/format/iidxchart.py b/bemani/format/iidxchart.py index 72ec59a..c0c4f84 100644 --- a/bemani/format/iidxchart.py +++ b/bemani/format/iidxchart.py @@ -1,6 +1,5 @@ import struct -from typing import List, Optional, Tuple -from typing_extensions import Final +from typing import Final, List, Optional, Tuple class IIDXChart: diff --git a/bemani/format/twodx.py b/bemani/format/twodx.py index 8c11586..1c7270e 100644 --- a/bemani/format/twodx.py +++ b/bemani/format/twodx.py @@ -15,7 +15,7 @@ class TwoDX: def __parse_file(self, data: bytes) -> None: # Parse file header - (name, headerSize, numfiles) = struct.unpack("<16sII", data[0:24]) + name, headerSize, numfiles = struct.unpack("<16sII", data[0:24]) self.__name = name.split(b"\x00")[0].decode("ascii") if headerSize != (72 + (4 * numfiles)): diff --git a/bemani/frontend/__init__.py b/bemani/frontend/__init__.py index 02176c6..db3c9b8 100644 --- a/bemani/frontend/__init__.py +++ b/bemani/frontend/__init__.py @@ -1,6 +1,5 @@ from bemani.frontend.app import app, config, loginrequired, loginprohibited - __all__ = [ "app", "config", diff --git a/bemani/frontend/account/__init__.py b/bemani/frontend/account/__init__.py index db98e0e..fa71c81 100644 --- a/bemani/frontend/account/__init__.py +++ b/bemani/frontend/account/__init__.py @@ -1,6 +1,5 @@ from bemani.frontend.account.account import account_pages - __all__ = [ "account_pages", ] diff --git a/bemani/frontend/account/account.py b/bemani/frontend/account/account.py index 1658c90..f2e9843 100644 --- a/bemani/frontend/account/account.py +++ b/bemani/frontend/account/account.py @@ -25,7 +25,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - account_pages = Blueprint( "account_pages", __name__, diff --git a/bemani/frontend/admin/__init__.py b/bemani/frontend/admin/__init__.py index 827c10d..1cb5ece 100644 --- a/bemani/frontend/admin/__init__.py +++ b/bemani/frontend/admin/__init__.py @@ -1,6 +1,5 @@ from bemani.frontend.admin.admin import admin_pages - __all__ = [ "admin_pages", ] diff --git a/bemani/frontend/arcade/__init__.py b/bemani/frontend/arcade/__init__.py index b6246cb..8507e81 100644 --- a/bemani/frontend/arcade/__init__.py +++ b/bemani/frontend/arcade/__init__.py @@ -1,6 +1,5 @@ from bemani.frontend.arcade.arcade import arcade_pages - __all__ = [ "arcade_pages", ] diff --git a/bemani/frontend/arcade/arcade.py b/bemani/frontend/arcade/arcade.py index cef62cb..9e1811d 100644 --- a/bemani/frontend/arcade/arcade.py +++ b/bemani/frontend/arcade/arcade.py @@ -17,7 +17,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - arcade_pages = Blueprint( "arcade_pages", __name__, diff --git a/bemani/frontend/bishi/__init__.py b/bemani/frontend/bishi/__init__.py index f2d5ea3..a2a8028 100644 --- a/bemani/frontend/bishi/__init__.py +++ b/bemani/frontend/bishi/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.bishi.endpoints import bishi_pages from bemani.frontend.bishi.cache import BishiBashiCache - __all__ = [ "BishiBashiCache", "bishi_pages", diff --git a/bemani/frontend/bishi/endpoints.py b/bemani/frontend/bishi/endpoints.py index 5c941b0..8d73aa4 100644 --- a/bemani/frontend/bishi/endpoints.py +++ b/bemani/frontend/bishi/endpoints.py @@ -11,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - bishi_pages = Blueprint( "bishi_pages", __name__, diff --git a/bemani/frontend/danevo/__init__.py b/bemani/frontend/danevo/__init__.py index e26a13b..972adf2 100644 --- a/bemani/frontend/danevo/__init__.py +++ b/bemani/frontend/danevo/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.danevo.endpoints import danevo_pages from bemani.frontend.danevo.cache import DanceEvolutionCache - __all__ = [ "DanceEvolutionCache", "danevo_pages", diff --git a/bemani/frontend/danevo/endpoints.py b/bemani/frontend/danevo/endpoints.py index c658b0a..2eb5cd9 100644 --- a/bemani/frontend/danevo/endpoints.py +++ b/bemani/frontend/danevo/endpoints.py @@ -10,7 +10,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - danevo_pages = Blueprint( "danevo_pages", __name__, diff --git a/bemani/frontend/ddr/__init__.py b/bemani/frontend/ddr/__init__.py index 4be18d6..731dc00 100644 --- a/bemani/frontend/ddr/__init__.py +++ b/bemani/frontend/ddr/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.ddr.endpoints import ddr_pages from bemani.frontend.ddr.cache import DDRCache - __all__ = [ "DDRCache", "ddr_pages", diff --git a/bemani/frontend/ddr/endpoints.py b/bemani/frontend/ddr/endpoints.py index 60c4947..da0059f 100644 --- a/bemani/frontend/ddr/endpoints.py +++ b/bemani/frontend/ddr/endpoints.py @@ -11,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - ddr_pages = Blueprint( "ddr_pages", __name__, diff --git a/bemani/frontend/home/__init__.py b/bemani/frontend/home/__init__.py index 558a11a..13b8ccb 100644 --- a/bemani/frontend/home/__init__.py +++ b/bemani/frontend/home/__init__.py @@ -1,6 +1,5 @@ from bemani.frontend.home.home import home_pages - __all__ = [ "home_pages", ] diff --git a/bemani/frontend/home/home.py b/bemani/frontend/home/home.py index c7f01cb..7f46cc7 100644 --- a/bemani/frontend/home/home.py +++ b/bemani/frontend/home/home.py @@ -7,7 +7,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - home_pages = Blueprint( "home_pages", __name__, diff --git a/bemani/frontend/iidx/__init__.py b/bemani/frontend/iidx/__init__.py index 93f8cb2..3ef730b 100644 --- a/bemani/frontend/iidx/__init__.py +++ b/bemani/frontend/iidx/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.iidx.endpoints import iidx_pages from bemani.frontend.iidx.cache import IIDXCache - __all__ = [ "IIDXCache", "iidx_pages", diff --git a/bemani/frontend/jubeat/__init__.py b/bemani/frontend/jubeat/__init__.py index dda09e8..7aa1240 100644 --- a/bemani/frontend/jubeat/__init__.py +++ b/bemani/frontend/jubeat/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.jubeat.endpoints import jubeat_pages from bemani.frontend.jubeat.cache import JubeatCache - __all__ = [ "JubeatCache", "jubeat_pages", diff --git a/bemani/frontend/mga/__init__.py b/bemani/frontend/mga/__init__.py index 0303d1d..b08ba9f 100644 --- a/bemani/frontend/mga/__init__.py +++ b/bemani/frontend/mga/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.mga.endpoints import mga_pages from bemani.frontend.mga.cache import MetalGearArcadeCache - __all__ = [ "MetalGearArcadeCache", "mga_pages", diff --git a/bemani/frontend/mga/endpoints.py b/bemani/frontend/mga/endpoints.py index 139d1fd..5137c3b 100644 --- a/bemani/frontend/mga/endpoints.py +++ b/bemani/frontend/mga/endpoints.py @@ -11,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - mga_pages = Blueprint( "mga_pages", __name__, diff --git a/bemani/frontend/museca/__init__.py b/bemani/frontend/museca/__init__.py index 385f9a8..cfe652d 100644 --- a/bemani/frontend/museca/__init__.py +++ b/bemani/frontend/museca/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.museca.endpoints import museca_pages from bemani.frontend.museca.cache import MusecaCache - __all__ = [ "MusecaCache", "museca_pages", diff --git a/bemani/frontend/museca/endpoints.py b/bemani/frontend/museca/endpoints.py index 38fd62d..f5234fd 100644 --- a/bemani/frontend/museca/endpoints.py +++ b/bemani/frontend/museca/endpoints.py @@ -11,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - museca_pages = Blueprint( "museca_pages", __name__, diff --git a/bemani/frontend/popn/__init__.py b/bemani/frontend/popn/__init__.py index d2c6b47..db68f88 100644 --- a/bemani/frontend/popn/__init__.py +++ b/bemani/frontend/popn/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.popn.endpoints import popn_pages from bemani.frontend.popn.cache import PopnMusicCache - __all__ = [ "PopnMusicCache", "popn_pages", diff --git a/bemani/frontend/popn/endpoints.py b/bemani/frontend/popn/endpoints.py index 4219b78..e89af70 100644 --- a/bemani/frontend/popn/endpoints.py +++ b/bemani/frontend/popn/endpoints.py @@ -10,7 +10,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - popn_pages = Blueprint( "popn_pages", __name__, diff --git a/bemani/frontend/reflec/__init__.py b/bemani/frontend/reflec/__init__.py index 0f74a1c..62bb3ec 100644 --- a/bemani/frontend/reflec/__init__.py +++ b/bemani/frontend/reflec/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.reflec.endpoints import reflec_pages from bemani.frontend.reflec.cache import ReflecBeatCache - __all__ = [ "ReflecBeatCache", "reflec_pages", diff --git a/bemani/frontend/reflec/endpoints.py b/bemani/frontend/reflec/endpoints.py index 9eb7919..913dc68 100644 --- a/bemani/frontend/reflec/endpoints.py +++ b/bemani/frontend/reflec/endpoints.py @@ -1,7 +1,6 @@ # vim: set fileencoding=utf-8 import re -from typing import Any, Dict, List -from typing_extensions import Final +from typing import Any, Dict, Final, List from flask import Blueprint, request, Response, url_for, abort from bemani.common import ID, GameConstants @@ -12,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - reflec_pages = Blueprint( "reflec_pages", __name__, diff --git a/bemani/frontend/sdvx/__init__.py b/bemani/frontend/sdvx/__init__.py index d0ac4d9..23da37b 100644 --- a/bemani/frontend/sdvx/__init__.py +++ b/bemani/frontend/sdvx/__init__.py @@ -1,7 +1,6 @@ from bemani.frontend.sdvx.endpoints import sdvx_pages from bemani.frontend.sdvx.cache import SoundVoltexCache - __all__ = [ "SoundVoltexCache", "sdvx_pages", diff --git a/bemani/frontend/sdvx/endpoints.py b/bemani/frontend/sdvx/endpoints.py index d91eb39..5365a1a 100644 --- a/bemani/frontend/sdvx/endpoints.py +++ b/bemani/frontend/sdvx/endpoints.py @@ -11,7 +11,6 @@ from bemani.frontend.templates import templates_location from bemani.frontend.static import static_location from bemani.frontend.types import g - sdvx_pages = Blueprint( "sdvx_pages", __name__, diff --git a/bemani/frontend/types.py b/bemani/frontend/types.py index 667eae8..9f6a768 100644 --- a/bemani/frontend/types.py +++ b/bemani/frontend/types.py @@ -1,6 +1,5 @@ from typing import Optional, TYPE_CHECKING - if TYPE_CHECKING: from flask.ctx import _AppCtxGlobals from flask_caching import Cache diff --git a/bemani/protocol/binary.py b/bemani/protocol/binary.py index 2eaeceb..311d9f2 100644 --- a/bemani/protocol/binary.py +++ b/bemani/protocol/binary.py @@ -1,6 +1,5 @@ import struct -from typing import Optional, List, Dict, Any -from typing_extensions import Final +from typing import Optional, List, Final, Dict, Any from bemani.protocol.stream import InputStream, OutputStream from bemani.protocol.node import Node diff --git a/bemani/protocol/lz77.py b/bemani/protocol/lz77.py index 978a955..06b7bac 100644 --- a/bemani/protocol/lz77.py +++ b/bemani/protocol/lz77.py @@ -1,12 +1,10 @@ import ctypes import os from collections import defaultdict -from typing import Generator, List, MutableMapping, Optional, Set, Tuple -from typing_extensions import Final +from typing import Final, Generator, List, MutableMapping, Optional, Set, Tuple from .. import package_root - # Attempt to use the faster C++ libraries if they're available try: clib = None diff --git a/bemani/protocol/node.py b/bemani/protocol/node.py index 9501237..4cc84bd 100644 --- a/bemani/protocol/node.py +++ b/bemani/protocol/node.py @@ -1,7 +1,6 @@ import copy import struct -from typing import Any, Dict, List, Optional, Union -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Union # Hack to get around mypy's lack of scoping on types. _renamed_float = float diff --git a/bemani/protocol/protocol.py b/bemani/protocol/protocol.py index fcb863d..3ee3c03 100644 --- a/bemani/protocol/protocol.py +++ b/bemani/protocol/protocol.py @@ -1,7 +1,6 @@ import binascii import hashlib -from typing import Optional -from typing_extensions import Final +from typing import Final, Optional from bemani.protocol.lz77 import Lz77 from bemani.protocol.binary import BinaryEncoding diff --git a/bemani/protocol/xml.py b/bemani/protocol/xml.py index 44ac51f..db80207 100644 --- a/bemani/protocol/xml.py +++ b/bemani/protocol/xml.py @@ -1,7 +1,6 @@ import copy import struct -from typing import Any, Dict, Iterator, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, Iterator, List, Optional, Tuple from bemani.protocol.stream import InputStream from bemani.protocol.node import Node diff --git a/bemani/sniff/__init__.py b/bemani/sniff/__init__.py index 91b8f4d..3ae2d9c 100644 --- a/bemani/sniff/__init__.py +++ b/bemani/sniff/__init__.py @@ -1,6 +1,5 @@ from bemani.sniff.sniff import Sniffer - __all__ = [ "Sniffer", ] diff --git a/bemani/sniff/sniff.py b/bemani/sniff/sniff.py index 4390ed0..e5a1944 100644 --- a/bemani/sniff/sniff.py +++ b/bemani/sniff/sniff.py @@ -1,7 +1,6 @@ import socket import struct -from typing import Any, Dict, List, Optional, Tuple -from typing_extensions import Final +from typing import Any, Dict, Final, List, Optional, Tuple class InvalidPacketException(Exception): diff --git a/bemani/tests/helpers.py b/bemani/tests/helpers.py index 54b6c25..ea8c4ad 100644 --- a/bemani/tests/helpers.py +++ b/bemani/tests/helpers.py @@ -4,7 +4,6 @@ import sys import unittest from typing import Iterable, List, Dict, Any - # Supress custom handler tracebacks inside handler frames __unittest = True diff --git a/bemani/tests/test_afp_decompile.py b/bemani/tests/test_afp_decompile.py index 05c7a7f..2eb66b0 100644 --- a/bemani/tests/test_afp_decompile.py +++ b/bemani/tests/test_afp_decompile.py @@ -38,7 +38,6 @@ from bemani.format.afp.types import ( OrIf, ) - OPEN_BRACKET = "{" CLOSE_BRACKET = "}" diff --git a/bemani/utils/afputils.py b/bemani/utils/afputils.py index 87e3831..0621570 100644 --- a/bemani/utils/afputils.py +++ b/bemani/utils/afputils.py @@ -144,18 +144,14 @@ def extract_txp2( else: print(f"Writing {filename}.xml texture info...") with open(f"{filename}.xml", "w") as sfp: - sfp.write( - textwrap.dedent( - f""" + sfp.write(textwrap.dedent(f""" {texture.width} {texture.height} {hex(texture.fmt)} {filename}.raw - """ - ).strip() - ) + """).strip()) if write_mappings: if not split_textures: @@ -171,9 +167,7 @@ def extract_txp2( else: print(f"Writing {filename}.xml region information...") with open(f"{filename}.xml", "w") as sfp: - sfp.write( - textwrap.dedent( - f""" + sfp.write(textwrap.dedent(f""" {region.left} {region.top} @@ -181,9 +175,7 @@ def extract_txp2( {region.bottom} {texturename} - """ - ).strip() - ) + """).strip()) if afpfile.fontdata is not None: filename = os.path.join(output_dir, "fontinfo.xml") diff --git a/bemani/utils/jsx.py b/bemani/utils/jsx.py index df4f7ea..2c6ce80 100644 --- a/bemani/utils/jsx.py +++ b/bemani/utils/jsx.py @@ -4,7 +4,6 @@ from react.jsx import JSXTransformer # type: ignore from bemani.frontend.app import polyfill_fragments - SCRIPT_PATH: str = os.path.dirname(os.path.realpath(__file__)) diff --git a/bemani/utils/psmap.py b/bemani/utils/psmap.py index 1388028..f385dd8 100644 --- a/bemani/utils/psmap.py +++ b/bemani/utils/psmap.py @@ -40,12 +40,12 @@ def parse_psmap(pe: PEFile, offset: str, rootname: str, *, verbose: bool = False chunk = pe.data[base : (base + 24)] base = base + 24 - (nodetype, mandatory, outoffset, width, nameptr, default) = struct.unpack(" int: parser = argparse.ArgumentParser( formatter_class=argparse.RawDescriptionHelpFormatter, description="A utility to print structs out of a DLL.", - epilog=( - """ + epilog=(""" Some examples of valid format specifiers and what they do are as follows: *h = Decodes an array of short pointers, decoding the resulting shorts for each pointer in the array. @@ -256,8 +255,7 @@ Ih&h = Decodes an array of structures containing an unsigned integer and two sho *z&+0x200# = Decodes an array of null-terminated string pointers, displaying the array entry number in hex starting at 0x200 and string. Broken down, it has the following parts: *z = Dereference the current value (*) and treat that integer as a pointer to a null-terminated string (z). &+0x200# = Print the current line number (#), offset by the value 0x200 (+0x200) as a hex number (&). -""" - ), +"""), ) parser.add_argument( "--file",