fix minor comments

Author: twiggler

dissect/target/helpers/nfs/client.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from contextlib import AbstractContextManager
-from types import TracebackType
-from typing import Generic, Iterator, NamedTuple, TypeVar
+from typing import TYPE_CHECKING, Generic, Iterator, NamedTuple, TypeVar
 
 from dissect.target.helpers.nfs.nfs3 import (
     CookieVerf3,
@@ -24,6 +23,9 @@
 from dissect.target.helpers.sunrpc.client import AuthScheme
 from dissect.target.helpers.sunrpc.client import Client as SunRpcClient
 
+if TYPE_CHECKING:
+    from types import TracebackType
+
 Credentials = TypeVar("Credentials")
 Verifier = TypeVar("Verifier")
 

dissect/target/helpers/sunrpc/client.py

@@ -4,10 +4,8 @@
 import socket
 from contextlib import AbstractContextManager
 from dataclasses import dataclass
-from types import TracebackType
-from typing import Generic, TypeVar
+from typing import TYPE_CHECKING, Generic, TypeVar
 
-from dissect.target.helpers.nfs.nfs3 import ProcedureDescriptor
 from dissect.target.helpers.sunrpc import sunrpc
 from dissect.target.helpers.sunrpc.serializer import (
     AuthNullSerializer,
@@ -18,6 +16,12 @@
     XdrSerializer,
 )
 
+if TYPE_CHECKING:
+    from types import TracebackType
+
+    from dissect.target.helpers.nfs.nfs3 import ProcedureDescriptor
+
+
 Credentials = TypeVar("Credentials")
 Verifier = TypeVar("Verifier")
 Params = TypeVar("Params")

dissect/target/helpers/sunrpc/serializer.py

@@ -3,7 +3,7 @@
 import io
 from abc import ABC, abstractmethod
 from enum import IntEnum
-from typing import Generic, Type, TypeVar
+from typing import Generic, TypeVar
 
 from dissect.target.helpers.sunrpc import sunrpc
 
@@ -118,7 +118,7 @@ def _read_int32(self, payload: io.BytesIO) -> int:
     def _read_uint64(self, payload: io.BytesIO) -> int:
         return int.from_bytes(payload.read(8), byteorder="big", signed=False)
 
-    def _read_enum(self, payload: io.BytesIO, enum: Type[EnumType]) -> EnumType:
+    def _read_enum(self, payload: io.BytesIO, enum: type[EnumType]) -> EnumType:
         value = self._read_int32(payload)
         return enum(value)
 
@@ -288,9 +288,9 @@ def _read_rejected_reply(self, payload: io.BytesIO) -> sunrpc.RejectedReply:
         elif reject_stat == sunrpc.RejectStat.AUTH_ERROR:
             auth_stat = self._read_enum(payload, sunrpc.AuthStat)
             return sunrpc.RejectedReply(reject_stat, auth_stat)
-        else:
-            # assert_never is slightly better, but only available starting from Python 3.11
-            raise ValueError(f"Unexpected value for reject_stat: {reject_stat}")
+
+        # assert_never is slightly better, but only available starting from Python 3.11
+        raise ValueError(f"Unexpected value for reject_stat: {reject_stat}")
 
     def _read_mismatch(self, payload: io.BytesIO) -> sunrpc.Mismatch:
         low = self._read_uint32(payload)