Fix MyPy issues

Author: DimitriPapadopoulos

pynetdicom/_handlers.py

@@ -2,7 +2,7 @@
 
 import logging
 from struct import unpack, calcsize
-from typing import TYPE_CHECKING, cast, Any
+from typing import TYPE_CHECKING, cast, Any, TypeAlias
 from collections.abc import Sequence, Iterator
 
 from pydicom.dataset import Dataset
@@ -2493,13 +2493,13 @@ def _recv_n_delete_rsp(event: "Event") -> list[str]:
     return s
 
 
-StatusType = int | Dataset
-DatasetType = Dataset | None
-UserReturnType = tuple[StatusType, DatasetType]
-DestinationType = tuple[str, int] | tuple[str, int, dict[str, Any]]
-CFindType = Iterator[UserReturnType]
-CGetType = Iterator[int | UserReturnType]
-CMoveType = Iterator[DestinationType | int | UserReturnType]
+StatusType: TypeAlias = int | Dataset
+DatasetType: TypeAlias = Dataset | None
+UserReturnType: TypeAlias = tuple[StatusType, DatasetType]
+DestinationType: TypeAlias = tuple[str, int] | tuple[str, int, dict[str, Any]]
+CFindType: TypeAlias = Iterator[UserReturnType]
+CGetType: TypeAlias = Iterator[int | UserReturnType]
+CMoveType: TypeAlias = Iterator[DestinationType | int | UserReturnType]
 
 
 # Example handlers used for the documentation

pynetdicom/ae.py

@@ -10,8 +10,9 @@
 import threading
 from typing import (
     cast,
-    TypeVar,
     Any,
+    TypeAlias,
+    TypeVar,
 )
 from collections.abc import Sequence
 import warnings
@@ -40,8 +41,8 @@
 
 
 _T = TypeVar("_T")
-ListCXType = list[PresentationContext]
-TSyntaxType = None | str | UID | Sequence[str] | Sequence[UID]
+ListCXType: TypeAlias = list[PresentationContext]
+TSyntaxType: TypeAlias = None | str | UID | Sequence[str] | Sequence[UID]
 
 
 class ApplicationEntity:
@@ -412,7 +413,7 @@ def add_supported_context(
         else:
             context = PresentationContext()
             context.abstract_syntax = abstract_syntax
-            context.transfer_syntax = transfer_syntax  # type: ignore
+            context.transfer_syntax = transfer_syntax
             context.scu_role = None or scu_role
             context.scp_role = None or scp_role
 

pynetdicom/association.py

@@ -1845,7 +1845,7 @@ def send_c_store(
             if not _config.STORE_SEND_CHUNKED_DATASET:
                 dataset = dcmread(os.fspath(fpath))
             else:
-                dataset = None  # type: ignore[assignment]
+                dataset = None
                 allow_conversion = False
                 file_meta, offset = split_dataset(fpath)
                 req._dataset_path = (fpath, offset)

pynetdicom/dimse_messages.py

@@ -474,7 +474,7 @@ def decode_msg(self, primitive: P_DATA, assoc: "Association | None" = None) -> b
                         sop_class = cast(UID, cs.AffectedSOPClassUID)
                         sop_instance = cast(UID, cs.AffectedSOPInstanceUID)
                         write_file_meta_info(
-                            self._data_set_file,  # type: ignore
+                            self._data_set_file,
                             create_file_meta(
                                 sop_class_uid=sop_class,
                                 sop_instance_uid=sop_instance,

pynetdicom/dsutils.py

@@ -155,7 +155,7 @@ def encode(
         fp.close()
         return None
 
-    bytestring: bytes = fp.parent.getvalue()  # type: ignore
+    bytestring: bytes = fp.parent.getvalue()
     fp.close()
 
     if deflated:
@@ -181,7 +181,7 @@ def encode_file_meta(file_meta: FileMetaDataset) -> bytes:
     buffer.is_little_endian = True
     buffer.is_implicit_VR = False
     write_file_meta_info(buffer, file_meta)
-    return buffer.getvalue()
+    return buffer.getvalue()  # type: ignore[no-any-return] # FIXME
 
 
 def pretty_dataset(ds: Dataset, indent: int = 0, indent_char: str = "  ") -> list[str]:
@@ -288,7 +288,7 @@ def split_dataset(path: Path) -> tuple[Dataset, int]:
 
     def _not_group_0002(tag: BaseTag, VR: str | None, length: int) -> bool:
         """Return True if the tag is not in group 0x0002, False otherwise."""
-        return tag.group != 2
+        return tag.group != 2  # type: ignore[no-any-return] # FIXME
 
     with open(path, "rb") as fp:
         read_preamble(fp, False)

pynetdicom/events.py

@@ -57,10 +57,10 @@
 
 
 EventType: TypeAlias = "NotificationEvent | InterventionEvent"
-EventHandlerType = tuple[EventType, Callable] | tuple[EventType, Callable, list[Any]]
-_BasicReturnType = Dataset | int
-_DatasetReturnType = tuple[_BasicReturnType, Dataset | None]
-_IteratorType = Iterator[tuple[_BasicReturnType, Dataset | None]]
+EventHandlerType: TypeAlias = tuple[EventType, Callable] | tuple[EventType, Callable, list[Any]]
+_BasicReturnType: TypeAlias = Dataset | int
+_DatasetReturnType: TypeAlias = tuple[_BasicReturnType, Dataset | None]
+_IteratorType: TypeAlias = Iterator[tuple[_BasicReturnType, Dataset | None]]
 
 
 # Notification events

pynetdicom/pdu_items.py

@@ -2637,7 +2637,7 @@ def from_primitive(self, primitive: "SOPClassCommonExtendedNegotiation") -> None
         self.sop_class_uid = primitive.sop_class_uid
         self.service_class_uid = primitive.service_class_uid
         self.related_general_sop_class_identification = (
-            primitive.related_general_sop_class_identification  # type: ignore[assignment]
+            primitive.related_general_sop_class_identification
         )
 
     def to_primitive(self) -> "SOPClassCommonExtendedNegotiation":
@@ -2655,7 +2655,7 @@ def to_primitive(self) -> "SOPClassCommonExtendedNegotiation":
         primitive.sop_class_uid = self.sop_class_uid
         primitive.service_class_uid = self.service_class_uid
         primitive.related_general_sop_class_identification = (
-            self.related_general_sop_class_identification  # type: ignore[assignment]
+            self.related_general_sop_class_identification
         )
 
         return primitive
@@ -2732,7 +2732,7 @@ def _encoders(self) -> Any:
         ]
 
     @staticmethod
-    def _generate_items(bytestream: bytes) -> Iterator[UID]:  # type: ignore
+    def _generate_items(bytestream: bytes) -> Iterator[UID]:
         """Yield Related General SOP Class UIDs from `bytestream`.
 
          Parameters
@@ -2905,7 +2905,7 @@ def __str__(self) -> str:
 
         return "\n".join(s)
 
-    def _wrap_generate_items(self, b: bytes) -> list[UID]:  # type: ignore
+    def _wrap_generate_items(self, b: bytes) -> list[UID]:
         """Return a list of UID items generated from `bytestream`."""
         return list(self._generate_items(b))
 

pynetdicom/presentation.py

@@ -250,7 +250,9 @@ def add_transfer_syntax(self, syntax: None | str | bytes | UID) -> None:
         if syntax is None:
             return
 
-        if isinstance(syntax, str):  # includes UID
+        if isinstance(syntax, UID):
+            pass
+        elif isinstance(syntax, str):
             syntax = UID(syntax)
         elif isinstance(syntax, bytes):
             syntax = UID(syntax.decode("ascii"))
@@ -264,15 +266,16 @@ def add_transfer_syntax(self, syntax: None | str | bytes | UID) -> None:
 
         # If the transfer syntax is rejected we may receive an empty str
         if syntax not in self._transfer_syntax and syntax != "":
-            if not syntax.is_valid:
+            if not syntax.is_valid:  # type: ignore[union-attr] # FIXME
                 LOGGER.warning(
-                    f"A non-conformant UID has been added to 'transfer_syntax': '{syntax}'"
+                    "A non-conformant UID has been added to 'transfer_syntax': "
+                    f"'{syntax}'"  # type: ignore[str-bytes-safe] # FIXME
                 )
 
-            if not syntax.is_private and not syntax.is_transfer_syntax:
+            if not syntax.is_private and not syntax.is_transfer_syntax:  # type: ignore[union-attr] # FIXME
                 LOGGER.warning(
                     "A UID has been added to 'transfer_syntax' that is not a known "
-                    f"public transfer syntax: '{syntax}'"
+                    f"public transfer syntax: '{syntax}'"  # type: ignore[str-bytes-safe] # FIXME
                 )
 
             self._transfer_syntax.append(syntax)
@@ -365,7 +368,7 @@ def __ne__(self, other: object) -> bool:
 
     def __repr__(self) -> str:
         """Representation of the Presentation Context."""
-        return cast(UID, self.abstract_syntax).name
+        return cast(UID, self.abstract_syntax).name  # type: ignore[no-any-return] # FIXME
 
     @property
     def scp_role(self) -> None | bool:

pynetdicom/service_class.py

@@ -10,6 +10,7 @@
     TYPE_CHECKING,
     cast,
     Any,
+    TypeAlias,
     TypeVar,
 )
 from collections.abc import Iterator, Sequence
@@ -64,9 +65,9 @@
     _QR = C_FIND | C_MOVE | C_GET
 
 
-StatusType = int | Dataset
-DatasetType = Dataset | None
-UserReturnType = tuple[StatusType, DatasetType]
+StatusType: TypeAlias = int | Dataset
+DatasetType: TypeAlias = Dataset | None
+UserReturnType: TypeAlias = tuple[StatusType, DatasetType]
 _T = TypeVar("_T", bound=DIMSEPrimitive)
 _ExcInfoType = (
     tuple[None, None, None] | tuple[type[BaseException], BaseException, TracebackType]

pynetdicom/utils.py

@@ -335,6 +335,6 @@ def validate_uid(uid: UID) -> bool:
         ``True`` if the value is considered valid, ``False`` otherwise.
     """
     if _config.ENFORCE_UID_CONFORMANCE:
-        return uid.is_valid
+        return uid.is_valid  # type: ignore[no-any-return]  # FIXME
 
     return 0 < len(uid) < 65