diff --git a/novelwriter/common.py b/novelwriter/common.py index 317aced5..17a465ee 100644 --- a/novelwriter/common.py +++ b/novelwriter/common.py @@ -33,7 +33,7 @@ from collections.abc import Callable from configparser import ConfigParser from datetime import datetime from pathlib import Path -from typing import TYPE_CHECKING, Any, Literal, TypeVar +from typing import Any, Literal, TypeGuard, TypeVar from urllib.parse import urljoin from urllib.request import pathname2url @@ -44,9 +44,6 @@ from novelwriter.constants import nwConst, nwLabels, nwUnicode, trConst from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType from novelwriter.error import logException -if TYPE_CHECKING: # pragma: no cover - from typing import TypeGuard # Requires Python 3.10 - logger = logging.getLogger(__name__) _Type = TypeVar("_Type") diff --git a/novelwriter/core/itemmodel.py b/novelwriter/core/itemmodel.py index 9cd82c39..8910e2b4 100644 --- a/novelwriter/core/itemmodel.py +++ b/novelwriter/core/itemmodel.py @@ -60,9 +60,7 @@ NODE_FLAGS = Qt.ItemFlag.ItemIsEnabled NODE_FLAGS |= Qt.ItemFlag.ItemIsSelectable NODE_FLAGS |= Qt.ItemFlag.ItemIsDropEnabled -if TYPE_CHECKING: # pragma: no cover - # Requires Python 3.10 - T_NodeData = str | QIcon | QFont | Qt.AlignmentFlag | None +T_NodeData = str | QIcon | QFont | Qt.AlignmentFlag | None class ProjectNode: diff --git a/novelwriter/core/project.py b/novelwriter/core/project.py index e568e1cc..50bf4a94 100644 --- a/novelwriter/core/project.py +++ b/novelwriter/core/project.py @@ -30,7 +30,6 @@ from enum import Enum from functools import partial from pathlib import Path from time import time -from typing import TYPE_CHECKING from PyQt5.QtCore import QCoreApplication @@ -45,15 +44,12 @@ from novelwriter.core.options import OptionState from novelwriter.core.projectdata import NWProjectData from novelwriter.core.projectxml import ProjectXMLReader, ProjectXMLWriter, XMLReadState from novelwriter.core.sessions import NWSessionLog +from novelwriter.core.status import T_StatusKind, T_UpdateEntry from novelwriter.core.storage import NWStorage, NWStorageOpen from novelwriter.core.tree import NWTree from novelwriter.enum import nwItemClass, nwItemLayout, nwItemType from novelwriter.error import logException -if TYPE_CHECKING: # pragma: no cover - # Requires Python 3.10 - from novelwriter.core.status import T_StatusKind, T_UpdateEntry - logger = logging.getLogger(__name__) diff --git a/novelwriter/core/status.py b/novelwriter/core/status.py index f8569532..9a60d06a 100644 --- a/novelwriter/core/status.py +++ b/novelwriter/core/status.py @@ -29,7 +29,7 @@ import logging import random from collections.abc import Iterable -from typing import TYPE_CHECKING, Literal +from typing import TYPE_CHECKING, Literal, TypeGuard from PyQt5.QtCore import QPointF, Qt from PyQt5.QtGui import QColor, QIcon, QPainter, QPainterPath, QPixmap, QPolygonF @@ -39,9 +39,6 @@ from novelwriter.common import simplified from novelwriter.enum import nwStatusShape from novelwriter.types import QtPaintAntiAlias, QtTransparent -if TYPE_CHECKING: # pragma: no cover - from typing import TypeGuard # Requires Python 3.10 - logger = logging.getLogger(__name__)