pytests mostly

Author: alexandraBara

nodescraper/configbuilder.py

@@ -25,7 +25,6 @@
 ###############################################################################
 import enum
 import logging
-import types
 from typing import Any, Optional, Type, Union
 
 from pydantic import BaseModel
@@ -80,7 +79,7 @@ def _update_config(cls, config_key, type_data: TypeData, config: dict):
         type_class_map = {
             type_class.type_class: type_class for type_class in type_data.type_classes
         }
-        if types.NoneType in type_class_map:
+        if type(None) in type_class_map:
             return
 
         model_arg = next(

nodescraper/connection/inband/inbandremote.py

@@ -105,7 +105,7 @@ def read_file(
 
         Args:
             filename (str): Path to file on remote host
-            encoding (str | None, optional): If None, file is read as binary. If str, decode using that encoding. Defaults to "utf-8".
+            encoding Optional[Union[str, None]]: If None, file is read as binary. If str, decode using that encoding. Defaults to "utf-8".
             strip (bool): Strip whitespace for text files. Ignored for binary.
 
         Returns:

nodescraper/connection/inband/sshparams.py

@@ -34,9 +34,10 @@ class SSHConnectionParams(BaseModel):
     """Class which holds info for an SSH connection"""
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
+
     hostname: Union[IPvAnyAddress, str]
     username: str
     password: Optional[SecretStr] = None
     pkey: Optional[PKey] = None
     key_filename: Optional[str] = None
-    port: Annotated[int, Field(strict=True, gt=0, lt=65536)] = 22
+    port: Annotated[int, Field(strict=True, gt=0, le=65535)] = 22

nodescraper/plugins/inband/dmesg/dmesgdata.py

@@ -92,7 +92,7 @@ def import_model(cls, model_input: Union[dict, str]) -> "DmesgData":
         """Load dmesg data
 
         Args:
-            model_input (dict | str): dmesg file name or dmesg data dict
+            model_input Union[dict, str]: dmesg file name or dmesg data dict
 
         Raises:
             ValueError: id model data has an invalid value

nodescraper/resultcollators/tablesummary.py

@@ -51,7 +51,7 @@ def gen_str_table(headers: list[str], rows: list[str]):
             border = f"+{'+'.join('-' * (width + 2) for width in column_widths)}+"
 
             def gen_row(row):
-                return f"|  {' | '.join(str(cell).ljust(width) for cell, width in zip(row, column_widths, strict=False))} |"
+                return f"|  {' | '.join(str(cell).ljust(width) for cell, width in zip(row, column_widths))} |"
 
             table = [border, gen_row(headers), border, *[gen_row(row) for row in rows], border]
             return "\n".join(table)

nodescraper/typeutils.py

@@ -61,7 +61,7 @@ def get_generic_map(cls, class_type: Type[Any]) -> dict:
             gen_base = class_type.__orig_bases__[0]
             class_org = get_origin(gen_base)
             args = get_args(gen_base)
-            generic_map = dict(zip(class_org.__parameters__, args, strict=False))
+            generic_map = dict(zip(class_org.__parameters__, args))
         else:
             generic_map = {}
 
@@ -122,9 +122,9 @@ def process_type(cls, input_type: type[Any]) -> list[TypeClass]:
         origin = get_origin(input_type)
         if origin is None:
             return [TypeClass(type_class=input_type)]
-        if origin in [Union, types.UnionType]:
+        if origin is Union or getattr(types, "UnionType", None) is origin:
             type_classes = []
-            input_types = [arg for arg in input_type.__args__ if arg != types.NoneType]
+            input_types = [arg for arg in input_type.__args__ if arg is not type(None)]
             for type_item in input_types:
                 origin = get_origin(type_item)
                 if origin is None:
@@ -134,7 +134,7 @@ def process_type(cls, input_type: type[Any]) -> list[TypeClass]:
                         TypeClass(
                             type_class=origin,
                             inner_type=next(
-                                (arg for arg in get_args(type_item) if arg != types.NoneType), None
+                                (arg for arg in get_args(type_item) if arg is not type(None)), None
                             ),
                         )
                     )
@@ -145,7 +145,7 @@ def process_type(cls, input_type: type[Any]) -> list[TypeClass]:
                 TypeClass(
                     type_class=origin,
                     inner_type=next(
-                        (arg for arg in get_args(input_type) if arg != types.NoneType), None
+                        (arg for arg in get_args(input_type) if arg is not type(None)), None
                     ),
                 )
             ]

test/unit/framework/test_type_utils.py

@@ -23,7 +23,7 @@
 # SOFTWARE.
 #
 ###############################################################################
-from typing import Generic, Optional, TypeVar
+from typing import Generic, Optional, TypeVar, Union
 
 from pydantic import BaseModel
 
@@ -37,7 +37,7 @@ class TestGenericBase(Generic[T]):
     def __init__(self, generic_type: T):
         self.generic_type = generic_type
 
-    def test_func(self, arg: list[str], arg2: bool | str, arg3: Optional[int] = None) -> T:
+    def test_func(self, arg: list[str], arg2: Union[bool, str], arg3: Optional[int] = None) -> T:
         return self.generic_type