Fix edge cases in new typing

Author: rbell517

nisystemlink/clients/dataframe/_data_frame_client.py

@@ -2,7 +2,7 @@
 
 from collections.abc import Iterable
 from io import BytesIO
-from typing import List
+from typing import List, Union
 
 try:
     import pyarrow as pa  # type: ignore
@@ -277,11 +277,12 @@ def _append_table_data_arrow(
     def append_table_data(
         self,
         id: str,
-        data:
-            models.AppendTableDataRequest
-            | models.DataFrame
-            | "pa.RecordBatch"  # type: ignore[name-defined]
-            | Iterable["pa.RecordBatch"],  # type: ignore[name-defined]
+        data: Union[
+            models.AppendTableDataRequest,
+            models.DataFrame,
+            "pa.RecordBatch",  # type: ignore[name-defined]
+            Iterable["pa.RecordBatch"],  # type: ignore[name-defined]
+        ] | None,
         *,
         end_of_data: bool | None = None,
     ) -> None:

nisystemlink/clients/tag/_core/_manual_reset_timer.py

@@ -6,7 +6,7 @@
 import threading
 import traceback
 from types import TracebackType
-from typing import Any, Callable, List, Type
+from typing import Any, Callable, List, Optional, Type
 
 import events
 from nisystemlink.clients.core._internal._classproperty_support import (
@@ -38,10 +38,10 @@ def __init_subclass__(cls) -> None:
     # Under certain circumstances, mypy complains about the event not having a type hint
     # unless we specify it explicitly. (But we also need to delete the attribute so that
     # Events.__getattr__ can do its magic.)
-    elapsed: events._EventSlot = None  # type: ignore[assignment]
+    elapsed = None  # type: events._EventSlot
     del elapsed
 
-    __null_timer_impl: "ManualResetTimer" | None = None
+    __null_timer_impl: Optional["ManualResetTimer"] = None
 
     @ClasspropertySupport.classproperty
     def null_timer(cls) -> "ManualResetTimer":