From 1358fbbca1ac51e6372ba21d2a7e6faa6822ee67 Mon Sep 17 00:00:00 2001 From: Viv Date: Sun, 30 Jul 2023 21:04:02 -0400 Subject: [PATCH] Rename `types.py` to `classes.py` to avoid nuitka error Context: https://stackoverflow.com/questions/43453414/cannot-import-name-mappingproxytype-error-after-importing-functools#comment82066966_46915574 --- pyproject.toml | 2 +- src/tja2fumen/__init__.py | 2 +- src/tja2fumen/{types.py => classes.py} | 0 src/tja2fumen/converters.py | 5 +++-- src/tja2fumen/parsers.py | 6 +++--- src/tja2fumen/writers.py | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) rename src/tja2fumen/{types.py => classes.py} (100%) diff --git a/pyproject.toml b/pyproject.toml index 4fd04c3..fe7d68b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ console_output_style = "count" [tool.flake8] exclude = "venv/" per-file-ignores = """ - ./src/tja2fumen/types.py: E221 + ./src/tja2fumen/classes.py: E221 ./testing/test_conversion.py: E221, E272 """ diff --git a/src/tja2fumen/__init__.py b/src/tja2fumen/__init__.py index 5e83b58..a98703e 100644 --- a/src/tja2fumen/__init__.py +++ b/src/tja2fumen/__init__.py @@ -11,7 +11,7 @@ from tja2fumen.parsers import parse_tja from tja2fumen.converters import convert_tja_to_fumen from tja2fumen.writers import write_fumen from tja2fumen.constants import COURSE_IDS -from tja2fumen.types import TJACourse +from tja2fumen.classes import TJACourse def main(argv: Sequence[str] = ()) -> None: diff --git a/src/tja2fumen/types.py b/src/tja2fumen/classes.py similarity index 100% rename from src/tja2fumen/types.py rename to src/tja2fumen/classes.py diff --git a/src/tja2fumen/converters.py b/src/tja2fumen/converters.py index 198ffe2..fba027c 100644 --- a/src/tja2fumen/converters.py +++ b/src/tja2fumen/converters.py @@ -4,8 +4,9 @@ Functions for converting TJA song data to Fumen song data. import re -from tja2fumen.types import (TJACourse, TJAMeasureProcessed, - FumenCourse, FumenHeader, FumenMeasure, FumenNote) +from tja2fumen.classes import (TJACourse, TJAMeasureProcessed, + FumenCourse, FumenHeader, FumenMeasure, + FumenNote) def process_tja_commands(tja: TJACourse) \ diff --git a/src/tja2fumen/parsers.py b/src/tja2fumen/parsers.py index 0540292..37c73dd 100644 --- a/src/tja2fumen/parsers.py +++ b/src/tja2fumen/parsers.py @@ -8,9 +8,9 @@ import struct from copy import deepcopy from typing import BinaryIO, Any -from tja2fumen.types import (TJASong, TJACourse, TJAMeasure, TJAData, - FumenCourse, FumenMeasure, FumenBranch, FumenNote, - FumenHeader) +from tja2fumen.classes import (TJASong, TJACourse, TJAMeasure, TJAData, + FumenCourse, FumenMeasure, FumenBranch, + FumenNote, FumenHeader) from tja2fumen.constants import (NORMALIZE_COURSE, COURSE_NAMES, BRANCH_NAMES, TJA_COURSE_NAMES, TJA_NOTE_TYPES, FUMEN_NOTE_TYPES) diff --git a/src/tja2fumen/writers.py b/src/tja2fumen/writers.py index 24d4534..4bc4417 100644 --- a/src/tja2fumen/writers.py +++ b/src/tja2fumen/writers.py @@ -5,7 +5,7 @@ Functions for writing song data to fumen files (.bin) import struct from typing import BinaryIO, Any -from tja2fumen.types import FumenCourse +from tja2fumen.classes import FumenCourse from tja2fumen.constants import BRANCH_NAMES, FUMEN_TYPE_NOTES