[releases/2.3] Update to Python 3.9 syntax (#1182)

Update to Python 3.9 syntax (#1092)

* Run pyupgrade --py39-plus

* Add `from __future__ import annotations` to all files that use `from typing import...` so we can use PEP 604 type hints

* Run `pyupgrade --py39-plus` again

* Run ni-python-styleguide and fix issues

* generator: Update Python syntax in  codegen templates

* examples: Update _helpers.py and type hints

* examples: Run ni-python-styleguide and fix errors, revert a couple format strings

* service: Delete types from docstrings

* Re-run pyupgrade --py39-plus

(cherry picked from commit addd51b)

Author: bkeryan

examples/game_of_life/_helpers.py

@@ -1,13 +1,15 @@
 """Helper classes and functions for measurement plug-in examples."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 from typing import Any, Callable, TypeVar
 
 import click
 
 
-class TestStandSupport(object):
+class TestStandSupport:
     """Class that communicates with TestStand."""
 
     _PIN_MAP_ID_VAR = "NI.MeasurementPlugIns.PinMapId"

examples/game_of_life/measurement.py

@@ -4,21 +4,24 @@
 import random
 import threading
 import time
-from typing import Any, Generator, List, Tuple
+from collections.abc import Generator
+from typing import Any
 
 import click
 import grpc
 import ni_measurement_plugin_sdk_service as nims
 from _helpers import configure_logging, verbosity_option
-from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types import xydata_pb2
+from ni_measurement_plugin_sdk_service._internal.stubs.ni.protobuf.types import (
+    xydata_pb2,
+)
 
 service_directory = pathlib.Path(__file__).resolve().parent
 measurement_service = nims.MeasurementService(
     service_config_path=service_directory / "game_of_life.serviceconfig",
     ui_file_paths=[service_directory / "game_of_life.measui"],
 )
 
-Grid = List[List[bool]]
+Grid = list[list[bool]]
 
 INFINITE_GENERATIONS = -1
 
@@ -32,7 +35,7 @@
 @measurement_service.output("generation", nims.DataType.UInt32)
 def measure(
     width: int, height: int, update_interval_msec: int, max_generations: int
-) -> Generator[Tuple[xydata_pb2.DoubleXYData, int], None, None]:
+) -> Generator[tuple[xydata_pb2.DoubleXYData, int], None, None]:
     """Streaming measurement that returns Conway's Game of Life grid as DoubleXYData."""
     cancellation_event = threading.Event()
     measurement_service.context.add_cancel_callback(cancellation_event.set)

examples/nidaqmx_analog_input/_helpers.py

@@ -1,13 +1,15 @@
 """Helper classes and functions for measurement plug-in examples."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 from typing import Any, Callable, TypeVar
 
 import click
 
 
-class TestStandSupport(object):
+class TestStandSupport:
     """Class that communicates with TestStand."""
 
     _PIN_MAP_ID_VAR = "NI.MeasurementPlugIns.PinMapId"

examples/nidaqmx_analog_input/measurement.py

@@ -3,7 +3,6 @@
 import logging
 import pathlib
 import sys
-from typing import List, Tuple
 
 import click
 import ni_measurement_plugin_sdk_service as nims
@@ -31,7 +30,7 @@
 @measurement_service.configuration("sample_rate", nims.DataType.Double, 1000.0)
 @measurement_service.configuration("number_of_samples", nims.DataType.UInt64, 100)
 @measurement_service.output("acquired_samples", nims.DataType.DoubleArray1D)
-def measure(pin_name: str, sample_rate: float, number_of_samples: int) -> Tuple[List[float]]:
+def measure(pin_name: str, sample_rate: float, number_of_samples: int) -> tuple[list[float]]:
     """Perform a finite analog input measurement with NI-DAQmx."""
     logging.info(
         "Executing measurement: pin_name=%s sample_rate=%g number_of_samples=%d",
@@ -68,7 +67,7 @@ def cancel_callback() -> None:
     return (voltage_values,)
 
 
-def _log_measured_values(samples: List[float], max_samples_to_display: int = 5) -> None:
+def _log_measured_values(samples: list[float], max_samples_to_display: int = 5) -> None:
     """Log the measured values."""
     if len(samples) > max_samples_to_display:
         for index, value in enumerate(samples[0 : max_samples_to_display - 1]):

examples/nidcpower_source_dc_voltage/_helpers.py

@@ -1,13 +1,15 @@
 """Helper classes and functions for measurement plug-in examples."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 from typing import Any, Callable, TypeVar
 
 import click
 
 
-class TestStandSupport(object):
+class TestStandSupport:
     """Class that communicates with TestStand."""
 
     _PIN_MAP_ID_VAR = "NI.MeasurementPlugIns.PinMapId"

examples/nidcpower_source_dc_voltage/measurement.py

@@ -7,8 +7,9 @@
 import sys
 import threading
 import time
+from collections.abc import Iterable
 from contextlib import ExitStack
-from typing import TYPE_CHECKING, Iterable, List, NamedTuple, Tuple
+from typing import TYPE_CHECKING, NamedTuple
 
 import click
 import grpc
@@ -69,7 +70,7 @@ def measure(
     current_limit: float,
     current_limit_range: float,
     source_delay: float,
-) -> Tuple[List[int], List[str], List[float], List[float], List[bool]]:
+) -> tuple[list[int], list[str], list[float], list[float], list[bool]]:
     """Source and measure a DC voltage with an NI SMU."""
     logging.info("Executing measurement: pin_names=%s voltage_level=%g", pin_names, voltage_level)
 
@@ -106,12 +107,12 @@ def measure(
                         channels, cancellation_event, nidcpower.enums.Event.SOURCE_COMPLETE, timeout
                     )
 
-                measurements: List[_Measurement] = []
+                measurements: list[_Measurement] = []
                 measured_sites, measured_pins = [], []
                 for session_info in session_infos:
                     channels = session_info.session.channels[session_info.channel_list]
                     # Measure the voltage and current for each output of the session.
-                    session_measurements: List[_Measurement] = channels.measure_multiple()
+                    session_measurements: list[_Measurement] = channels.measure_multiple()
 
                     for measurement, channel_mapping in zip(
                         session_measurements, session_info.channel_mappings

examples/nidcpower_source_dc_voltage_with_multiplexer/_helpers.py

@@ -1,13 +1,15 @@
 """Helper classes and functions for measurement plug-in examples."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 from typing import Any, Callable, TypeVar
 
 import click
 
 
-class TestStandSupport(object):
+class TestStandSupport:
     """Class that communicates with TestStand."""
 
     _PIN_MAP_ID_VAR = "NI.MeasurementPlugIns.PinMapId"

examples/nidcpower_source_dc_voltage_with_multiplexer/measurement.py

@@ -7,7 +7,7 @@
 import sys
 import threading
 import time
-from typing import TYPE_CHECKING, NamedTuple, Tuple
+from typing import TYPE_CHECKING, NamedTuple
 
 import click
 import grpc
@@ -63,7 +63,7 @@ def measure(
     current_limit: float,
     current_limit_range: float,
     source_delay: float,
-) -> Tuple[float, float]:
+) -> tuple[float, float]:
     """Source and measure a DC voltage with an NI SMU connected via an NI-SWITCH multiplexer."""
     logging.info("Executing measurement: pin_name=%s voltage_level=%g", pin_name, voltage_level)
 

examples/nidigital_spi/_helpers.py

@@ -1,13 +1,15 @@
 """Helper classes and functions for measurement plug-in examples."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 from typing import Any, Callable, TypeVar
 
 import click
 
 
-class TestStandSupport(object):
+class TestStandSupport:
     """Class that communicates with TestStand."""
 
     _PIN_MAP_ID_VAR = "NI.MeasurementPlugIns.PinMapId"

examples/nidigital_spi/measurement.py

@@ -1,9 +1,11 @@
 """Test a SPI device using an NI Digital Pattern instrument."""
 
+from __future__ import annotations
+
 import logging
 import pathlib
 import sys
-from typing import Iterable, Tuple, Union
+from collections.abc import Iterable
 
 import click
 import ni_measurement_plugin_sdk_service as nims
@@ -42,7 +44,7 @@ def measure(
     timing_file_path: str,
     pattern_file_path: str,
     load_files: bool,
-) -> Tuple:
+) -> tuple:
     """Test a SPI device using an NI Digital Pattern instrument."""
     logging.info("Starting test: pin_names=%s", pin_names)
 
@@ -80,7 +82,7 @@ def measure(
 
 
 def _resolve_relative_path(
-    directory_path: pathlib.Path, file_path: Union[str, pathlib.Path]
+    directory_path: pathlib.Path, file_path: str | pathlib.Path
 ) -> pathlib.Path:
     file_path = pathlib.Path(file_path)
     if file_path.is_absolute():