From 29eac0b4e5db6112ce57a1cdf3d419ee89e6afef Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Tue, 15 Oct 2024 21:36:15 +0200 Subject: [PATCH] Remove type alias for Python 3.9 --- novelwriter/core/buildsettings.py | 5 ++--- novelwriter/types.py | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/novelwriter/core/buildsettings.py b/novelwriter/core/buildsettings.py index 11f6f4a0..71662db4 100644 --- a/novelwriter/core/buildsettings.py +++ b/novelwriter/core/buildsettings.py @@ -40,7 +40,6 @@ from novelwriter.constants import nwFiles, nwHeadFmt from novelwriter.core.project import NWProject from novelwriter.enum import nwBuildFmt from novelwriter.error import logException -from novelwriter.types import T_Basic logger = logging.getLogger(__name__) @@ -48,7 +47,7 @@ logger = logging.getLogger(__name__) # ===================== # Each entry contains a tuple on the form: (type, default) -SETTINGS_TEMPLATE: dict[str, tuple[type, T_Basic]] = { +SETTINGS_TEMPLATE: dict[str, tuple[type, str | int | float | bool]] = { "filter.includeNovel": (bool, True), "filter.includeNotes": (bool, False), "filter.includeInactive": (bool, False), @@ -356,7 +355,7 @@ class BuildSettings: self._changed = True return - def setValue(self, key: str, value: T_Basic) -> None: + def setValue(self, key: str, value: str | int | float | bool) -> None: """Set a specific value for a build setting.""" if (d := SETTINGS_TEMPLATE.get(key)) and len(d) == 2 and isinstance(value, d[0]): self._changed = value != self._settings[key] diff --git a/novelwriter/types.py b/novelwriter/types.py index 11986d26..ab684dee 100644 --- a/novelwriter/types.py +++ b/novelwriter/types.py @@ -27,10 +27,6 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QColor, QFont, QPainter, QTextCharFormat, QTextCursor, QTextFormat from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QStyle -# Type Aliases - -T_Basic = str | int | float | bool - # Qt Alignment Flags QtAlignAbsolute = Qt.AlignmentFlag.AlignAbsolute