python-gvm 26.11.1__py3-none-any.whl → 26.11.2.dev1__py3-none-any.whl

gvm/__version__.py

@@ -2,4 +2,4 @@
 
 # THIS IS AN AUTOGENERATED FILE. DO NOT TOUCH!
 
-__version__ = "26.11.1"
+__version__ = "27.0.0"

gvm/_enum.py

@@ -4,7 +4,7 @@
 #
 
 from enum import Enum as PythonEnum
-from typing import Any, Optional, Type, TypeVar
+from typing import Any, TypeVar
 
 from gvm.errors import InvalidArgument
 
@@ -17,16 +17,16 @@ class Enum(PythonEnum):
     """
 
     @classmethod
-    def _missing_(cls: Type[Self], value: Any) -> Optional[Self]:
+    def _missing_(cls: type[Self], value: Any) -> Self | None:
         if isinstance(value, PythonEnum):
             return cls.from_string(value.name)
         return cls.from_string(str(value) if value else None)
 
     @classmethod
     def from_string(
-        cls: Type[Self],
-        value: Optional[str],
-    ) -> Optional[Self]:
+        cls: type[Self],
+        value: str | None,
+    ) -> Self | None:
         """
         Convert a string value into an Enum instance
 

gvm/connections/__init__.py

@@ -16,14 +16,14 @@ from ._tls import DEFAULT_GVM_PORT, TLSConnection
 from ._unix import DEFAULT_UNIX_SOCKET_PATH, UnixSocketConnection
 
 __all__ = (
-    "DEFAULT_TIMEOUT",
-    "DEFAULT_UNIX_SOCKET_PATH",
     "DEFAULT_GVM_PORT",
     "DEFAULT_HOSTNAME",
     "DEFAULT_KNOWN_HOSTS_FILE",
     "DEFAULT_SSH_PASSWORD",
-    "DEFAULT_SSH_USERNAME",
     "DEFAULT_SSH_PORT",
+    "DEFAULT_SSH_USERNAME",
+    "DEFAULT_TIMEOUT",
+    "DEFAULT_UNIX_SOCKET_PATH",
     "DebugConnection",
     "GvmConnection",
     "SSHConnection",

gvm/connections/_connection.py

@@ -6,7 +6,7 @@ import logging
 import socket as socketlib
 from abc import ABC, abstractmethod
 from time import time
-from typing import Optional, Protocol, Union, runtime_checkable
+from typing import Protocol, runtime_checkable
 
 from gvm.errors import GvmError
 
@@ -62,8 +62,8 @@ class AbstractGvmConnection(ABC):
             wait indefinitely
     """
 
-    def __init__(self, timeout: Optional[Union[int, float]] = DEFAULT_TIMEOUT):
-        self._socket: Optional[socketlib.SocketType] = None
+    def __init__(self, timeout: int | float | None = DEFAULT_TIMEOUT):
+        self._socket: socketlib.SocketType | None = None
         self._timeout = timeout if timeout is not None else DEFAULT_TIMEOUT
 
     def _read(self) -> bytes:

gvm/connections/_debug.py

@@ -26,7 +26,7 @@ class DebugConnection:
 
         logging.basicConfig(level=logging.DEBUG)
 
-        socket_connection = UnixSocketConnection(path='/var/run/gvm.sock')
+        socket_connection = UnixSocketConnection(path="/var/run/gvm.sock")
         connection = DebugConnection(socket_connection)
         gmp = GMP(connection=connection)
     """

gvm/connections/_ssh.py

@@ -8,10 +8,11 @@ import hashlib
 import logging
 import socket as socketlib
 import sys
+from collections.abc import Callable
 from os import PathLike
 from pathlib import Path
 from time import time
-from typing import Any, Callable, Optional, TextIO, Union
+from typing import Any, TextIO
 
 import paramiko
 import paramiko.ssh_exception
@@ -39,16 +40,16 @@ class SSHConnection:
     def __init__(
         self,
         *,
-        timeout: Optional[Union[int, float]] = DEFAULT_TIMEOUT,
-        hostname: Optional[str] = DEFAULT_HOSTNAME,
-        port: Optional[int] = DEFAULT_SSH_PORT,
-        username: Optional[str] = DEFAULT_SSH_USERNAME,
-        password: Optional[str] = DEFAULT_SSH_PASSWORD,
-        known_hosts_file: Optional[Union[str, PathLike]] = None,
-        auto_accept_host: Optional[bool] = None,
+        timeout: int | float | None = DEFAULT_TIMEOUT,
+        hostname: str | None = DEFAULT_HOSTNAME,
+        port: int | None = DEFAULT_SSH_PORT,
+        username: str | None = DEFAULT_SSH_USERNAME,
+        password: str | None = DEFAULT_SSH_PASSWORD,
+        known_hosts_file: str | PathLike | None = None,
+        auto_accept_host: bool | None = None,
         file: TextIO = sys.stdout,
-        input: Callable[[], str] = input,
-        exit: Callable[[str], Any] = sys.exit,
+        input: Callable[[], str] = input,  # noqa: A002
+        exit: Callable[[str], Any] = sys.exit,  # noqa: A002
     ) -> None:
         """
         Create a new SSH connection instance.
@@ -61,7 +62,7 @@ class SSHConnection:
             username: Username to use for SSH login. Default is "gmp".
             password: Password to use for SSH login. Default is "".
         """
-        self._client: Optional[paramiko.SSHClient] = None
+        self._client: paramiko.SSHClient | None = None
         self.hostname = hostname if hostname is not None else DEFAULT_HOSTNAME
         self.port = int(port) if port is not None else DEFAULT_SSH_PORT
         self.username = (
@@ -118,8 +119,7 @@ class SSHConnection:
         key_type = key.get_name().replace("ssh-", "").upper()
 
         logger.info(
-            "Warning: Permanently added '%s' (%s) to "
-            "the list of known hosts.",
+            "Warning: Permanently added '%s' (%s) to the list of known hosts.",
             self.hostname,
             key_type,
         )
@@ -135,8 +135,7 @@ class SSHConnection:
         key_type = key.get_name().replace("ssh-", "").upper()
 
         print(
-            f"The authenticity of host '{self.hostname}' can't "
-            "be established.",
+            f"The authenticity of host '{self.hostname}' can't be established.",
             file=self._file,
         )
         print(

gvm/connections/_tls.py

@@ -5,7 +5,6 @@
 import logging
 import socket as socketlib
 import ssl
-from typing import Optional, Union
 
 from ._connection import DEFAULT_TIMEOUT, AbstractGvmConnection
 
@@ -25,13 +24,13 @@ class TLSConnection(AbstractGvmConnection):
     def __init__(
         self,
         *,
-        certfile: Optional[str] = None,
-        cafile: Optional[str] = None,
-        keyfile: Optional[str] = None,
-        hostname: Optional[str] = DEFAULT_HOSTNAME,
-        port: Optional[int] = DEFAULT_GVM_PORT,
-        password: Optional[str] = None,
-        timeout: Optional[Union[int, float]] = DEFAULT_TIMEOUT,
+        certfile: str | None = None,
+        cafile: str | None = None,
+        keyfile: str | None = None,
+        hostname: str | None = DEFAULT_HOSTNAME,
+        port: int | None = DEFAULT_GVM_PORT,
+        password: str | None = None,
+        timeout: int | float | None = DEFAULT_TIMEOUT,
     ) -> None:
         """
         Create a new TLSConnection instance.

gvm/connections/_unix.py

@@ -4,7 +4,6 @@
 
 import socket as socketlib
 from os import PathLike, fspath
-from typing import Optional, Union
 
 from gvm.errors import GvmError
 
@@ -22,8 +21,8 @@ class UnixSocketConnection(AbstractGvmConnection):
     def __init__(
         self,
         *,
-        path: Optional[Union[str, PathLike[str]]] = DEFAULT_UNIX_SOCKET_PATH,
-        timeout: Optional[Union[int, float]] = DEFAULT_TIMEOUT,
+        path: str | PathLike[str] | None = DEFAULT_UNIX_SOCKET_PATH,
+        timeout: int | float | None = DEFAULT_TIMEOUT,
     ) -> None:
         """
         Create a new UnixSocketConnection instance.

gvm/errors.py

@@ -6,8 +6,6 @@
 Module for GVM errors
 """
 
-from typing import Optional
-
 
 class GvmError(Exception):
     """An exception for gvm errors
@@ -15,7 +13,7 @@ class GvmError(Exception):
     Base class for all exceptions originating in python-gvm.
     """
 
-    def __init__(self, message: Optional[str], *args):
+    def __init__(self, message: str | None, *args):
         super().__init__(message, *args)
         self.message = message
 
@@ -44,9 +42,7 @@ class GvmServerError(GvmError):
             and function
     """
 
-    def __init__(
-        self, status: Optional[str] = None, message: Optional[str] = None
-    ):
+    def __init__(self, status: str | None = None, message: str | None = None):
         super().__init__(message, status)
         self.status = status
 
@@ -71,9 +67,7 @@ class GvmResponseError(GvmClientError):
             and function
     """
 
-    def __init__(
-        self, status: Optional[str] = None, message: Optional[str] = None
-    ):
+    def __init__(self, status: str | None = None, message: str | None = None):
         super().__init__(message, status)
         self.status = status
 
@@ -87,7 +81,7 @@ class GvmResponseError(GvmClientError):
         )
 
 
-class InvalidArgument(GvmError):
+class InvalidArgument(GvmError):  # noqa: N818
     """Raised if an invalid argument/parameter is passed
 
     Derives from :py:class:`GvmError`
@@ -101,10 +95,10 @@ class InvalidArgument(GvmError):
 
     def __init__(
         self,
-        message: Optional[str] = None,
+        message: str | None = None,
         *,
-        argument: Optional[str] = None,
-        function: Optional[str] = None,
+        argument: str | None = None,
+        function: str | None = None,
     ):
         super().__init__(message, argument, function)
         self.argument = argument
@@ -123,7 +117,7 @@ class InvalidArgument(GvmError):
         return f"Invalid argument {self.argument} for {self.function}"
 
 
-class InvalidArgumentType(GvmError):
+class InvalidArgumentType(GvmError):  # noqa: N818
     """Raised if a passed argument has an invalid type
 
     Derives from :py:class:`GvmError`
@@ -138,8 +132,8 @@ class InvalidArgumentType(GvmError):
         self,
         argument: str,
         *,
-        arg_type: Optional[str] = None,
-        function: Optional[str] = None,
+        arg_type: str | None = None,
+        function: str | None = None,
     ):
         super().__init__(None)
         self.argument = argument
@@ -165,7 +159,7 @@ class InvalidArgumentType(GvmError):
         return f"Invalid argument type for argument {self.argument}."
 
 
-class RequiredArgument(GvmError):
+class RequiredArgument(GvmError):  # noqa: N818
     """Raised if a required argument/parameter is missing
 
     Derives from :py:class:`GvmError`
@@ -179,10 +173,10 @@ class RequiredArgument(GvmError):
 
     def __init__(
         self,
-        message: Optional[str] = None,
+        message: str | None = None,
         *,
-        argument: Optional[str] = None,
-        function: Optional[str] = None,
+        argument: str | None = None,
+        function: str | None = None,
     ):
         super().__init__(message, argument, function)
         self.argument = argument

gvm/protocols/_protocol.py

@@ -2,8 +2,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from collections.abc import Callable
 from types import TracebackType
-from typing import Callable, Generic, Optional, Type, TypeVar
+from typing import Generic, TypeVar
 
 from gvm.connections import GvmConnection
 
@@ -50,9 +51,9 @@ class GvmProtocol(Generic[T]):
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         self.disconnect()
 
@@ -126,7 +127,7 @@ class GvmProtocol(Generic[T]):
         try:
             send_data = self._protocol.send(request)
             self._send(send_data)
-            response: Optional[Response] = None
+            response: Response | None = None
             while not response:
                 received_data = self._read()
                 response = self._protocol.receive_data(received_data)

gvm/protocols/core/_connection.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import AnyStr, Optional, Protocol
+from typing import AnyStr, Protocol
 
 from lxml import etree
 
@@ -18,7 +18,7 @@ class XmlReader:
     """
 
     def start_xml(self) -> None:
-        self._first_element: Optional[etree._Element] = None
+        self._first_element: etree._Element | None = None
         # act on start and end element events and
         # allow huge text data (for report content)
         self._parser = etree.XMLPullParser(
@@ -60,7 +60,7 @@ class InvalidStateError(GvmError):
 class State(Protocol):
     def __set_context__(self, context: "Context") -> None: ...
     def send(self, request: Request) -> bytes: ...
-    def receive_data(self, data: bytes) -> Optional[Response]: ...
+    def receive_data(self, data: bytes) -> Response | None: ...
     def close(self) -> None: ...
 
 
@@ -83,7 +83,7 @@ class InitialState(AbstractState):
         self.set_next_state(AwaitingResponseState(request))
         return bytes(request)
 
-    def receive_data(self, data: bytes) -> Optional[Response]:
+    def receive_data(self, data: bytes) -> Response | None:
         raise InvalidStateError()
 
     def close(self) -> None:
@@ -101,7 +101,7 @@ class AwaitingResponseState(AbstractState):
     def close(self) -> None:
         self.set_next_state(InitialState())
 
-    def receive_data(self, data: bytes) -> Optional[Response]:
+    def receive_data(self, data: bytes) -> Response | None:
         next_state = ReceivingDataState(self._request)
         self.set_next_state(next_state)
         return next_state.receive_data(data)
@@ -118,7 +118,7 @@ class ErrorState(AbstractState):
     def close(self) -> None:
         self.set_next_state(InitialState())
 
-    def receive_data(self, data: bytes) -> Optional[Response]:
+    def receive_data(self, data: bytes) -> Response | None:
         raise InvalidStateError(self.message)
 
 
@@ -135,7 +135,7 @@ class ReceivingDataState(AbstractState):
     def close(self) -> None:
         self.set_next_state(InitialState())
 
-    def receive_data(self, data: bytes) -> Optional[Response]:
+    def receive_data(self, data: bytes) -> Response | None:
         self._data += data
         try:
             self._reader.feed_xml(data)
@@ -174,7 +174,7 @@ class Connection:
         """
         return self._state.send(request)
 
-    def receive_data(self, data: bytes) -> Optional[Response]:
+    def receive_data(self, data: bytes) -> Response | None:
         """
         Feed received data a response is complete
 

gvm/protocols/core/_response.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from functools import cached_property
-from typing import Optional, TypeVar
+from typing import TypeVar
 
 from gvm.errors import GvmError
 from gvm.xml import Element, parse_xml
@@ -18,7 +18,7 @@ class StatusError(GvmError):
     May be raised when calling `response.raise_for_status()`
     """
 
-    def __init__(self, message: Optional[str], *args, response: "Response"):
+    def __init__(self, message: str | None, *args, response: "Response"):
         super().__init__(message, *args)
         self.response = response
         self.request = response.request
@@ -42,7 +42,7 @@ class Response:
         """
         self._request = request
         self._data = data
-        self.__xml: Optional[Element] = None
+        self.__xml: Element | None = None
 
     def __root_element(self) -> Element:
         if self.__xml is None:
@@ -72,7 +72,7 @@ class Response:
         return self._request
 
     @cached_property
-    def status_code(self) -> Optional[int]:
+    def status_code(self) -> int | None:
         """
         The status code of the response
 

gvm/protocols/gmp/__init__.py

@@ -30,10 +30,10 @@ Gmp = GMP  # for backwards compatibility
 
 __all__ = (
     "GMP",
-    "Gmp",
+    "GMPNext",
     "GMPv224",
     "GMPv225",
     "GMPv226",
     "GMPv227",
-    "GMPNext",
+    "Gmp",
 )

gvm/protocols/gmp/_gmp.py

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import warnings
+from collections.abc import Callable
 from types import TracebackType
-from typing import Callable, Optional, Type, Union
 
 from gvm.__version__ import __version__
 from gvm.connections import GvmConnection
@@ -19,9 +19,9 @@ from ._gmp227 import GMPv227
 from ._gmpnext import GMPNext
 from .requests import Version
 
-SUPPORTED_GMP_VERSIONS = Union[
-    GMPv224[T], GMPv225[T], GMPv226[T], GMPv227[T], GMPNext[T]
-]
+SUPPORTED_GMP_VERSIONS = (
+    GMPv224[T] | GMPv225[T] | GMPv226[T] | GMPv227[T] | GMPNext[T]
+)
 _SUPPORTED_GMP_VERSION_STRINGS = ["22.4", "22.5", "22.6", "22.7", "22.8"]
 
 
@@ -67,7 +67,7 @@ class GMP(GvmProtocol[T]):
                 See :mod:`gvm.transforms` for existing transforms.
         """
         super().__init__(connection, transform=transform)
-        self._gmp: Optional[SUPPORTED_GMP_VERSIONS] = None
+        self._gmp: SUPPORTED_GMP_VERSIONS | None = None
 
     def determine_remote_gmp_version(self) -> str:
         """Determine the supported GMP version of the remote daemon"""
@@ -131,9 +131,9 @@ class GMP(GvmProtocol[T]):
 
     def __exit__(
         self,
-        exc_type: Optional[Type[BaseException]],
-        exc_value: Optional[BaseException],
-        traceback: Optional[TracebackType],
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
     ) -> None:
         if self._gmp:
             self._gmp.disconnect()