Change: Refactor module layout

Move generic protocol implementation into gvm.protocols.core and GMP
request classes to gvm.protocols.gmp.requests.

Author: bjoernricks

Diff for: gvm/protocols/_protocol.py

@@ -9,7 +9,7 @@
 
 from gvm.connections import GvmConnection
 
-from .gmp.core import Connection, Request, Response
+from .core import Connection, Request, Response
 
 T = TypeVar("T", default=str)
 
@@ -34,7 +34,7 @@ def __init__(
         self,
         connection: GvmConnection,
         *,
-        transform: Callable[[Response], T] = str_transform,  # type: ignore[assignment] # this should work with mypy 1.9.0 without an ignore
+        transform: Callable[[Response], T] = str_transform,  # type: ignore[assignment]
     ):
         self._connection = connection
         self._protocol = Connection()

Diff for: gvm/protocols/gmp/core/__init__.py renamed to gvm/protocols/core/__init__.py

@@ -7,12 +7,12 @@
 
 from gvm.connections import GvmConnection
 from gvm.errors import GvmError
+from gvm.protocols.core import Response
 
 from .._protocol import GvmProtocol, T, str_transform
 from ._gmp224 import GMPv224
 from ._gmp225 import GMPv225
-from .core import Response
-from .core.requests import Version
+from .requests import Version
 
 SUPPORTED_GMP_VERSIONS = Union[GMPv224, GMPv225]
 
@@ -53,7 +53,7 @@ def __init__(
         self,
         connection: GvmConnection,
         *,
-        transform: Callable[[Response], T] = str_transform,  # type: ignore[assignment] # this should work with mypy 1.9.0 without an ignore
+        transform: Callable[[Response], T] = str_transform,  # type: ignore[assignment]
     ):
         super().__init__(connection, transform=transform)
 
@@ -91,7 +91,7 @@ def determine_supported_gmp(self) -> SUPPORTED_GMP_VERSIONS:
                 f"The GMP version was {major_version}.{minor_version}"
             )
 
-        return gmp_class(self._connection, transform=self._transform_callable)
+        return gmp_class(self._connection, transform=self._transform_callable)  # type: ignore[arg-type]
 
     def __enter__(self):
         self._gmp = self.determine_supported_gmp()

Diff for: gvm/protocols/gmp/core/_connection.py renamed to gvm/protocols/core/_connection.py

@@ -5,7 +5,7 @@
 from typing import Optional, Union
 
 from .._protocol import GvmProtocol, T
-from .core.requests import (
+from .requests import (
     Authentication,
     PortList,
     PortRangeType,

Diff for: gvm/protocols/gmp/core/_request.py renamed to gvm/protocols/core/_request.py

@@ -6,7 +6,7 @@
 
 from .._protocol import T
 from ._gmp224 import GMPv224
-from .core.requests import (
+from .requests import (
     ResourceNames,
     ResourceType,
 )

Diff for: gvm/protocols/gmp/core/_response.py renamed to gvm/protocols/core/_response.py

@@ -3,10 +3,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from gvm.errors import RequiredArgument
+from gvm.protocols.core import Request
 from gvm.xml import XmlCommand
 
-from .._request import Request
-
 
 class Authentication:
 

Diff for: gvm/protocols/gmp/_gmp.py

@@ -6,11 +6,10 @@
 
 from gvm._enum import Enum
 from gvm.errors import RequiredArgument
+from gvm.protocols.core import Request
 from gvm.utils import to_bool
 from gvm.xml import XmlCommand
 
-from .._request import Request
-
 
 class PortRangeType(Enum):
     """Enum for port range type"""

Diff for: gvm/protocols/gmp/_gmp224.py

@@ -6,10 +6,9 @@
 
 from gvm._enum import Enum
 from gvm.errors import RequiredArgument
+from gvm.protocols.core import Request
 from gvm.xml import XmlCommand
 
-from .._request import Request
-
 
 class ResourceType(Enum):
     """Enum for resource types"""

Diff for: gvm/protocols/gmp/_gmp225.py

@@ -2,10 +2,9 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from gvm.protocols.core import Request
 from gvm.xml import XmlCommand
 
-from .._request import Request
-
 
 class Version:
     @staticmethod

Diff for: gvm/protocols/gmp/core/requests/__init__.py renamed to gvm/protocols/gmp/requests/__init__.py

@@ -5,7 +5,7 @@
 import unittest
 
 from gvm.errors import GvmError
-from gvm.protocols.gmp.core import Connection, InvalidStateError
+from gvm.protocols.core import Connection, InvalidStateError
 
 
 class RequestMock:

Diff for: gvm/protocols/gmp/core/requests/_auth.py renamed to gvm/protocols/gmp/requests/_auth.py

@@ -4,7 +4,7 @@
 
 import unittest
 
-from gvm.protocols.gmp.core import Request
+from gvm.protocols.core import Request
 
 
 class RequestMock:

Diff for: gvm/protocols/gmp/core/requests/_port_list.py renamed to gvm/protocols/gmp/requests/_port_list.py

@@ -4,7 +4,7 @@
 
 import unittest
 
-from gvm.protocols.gmp.core import Response, StatusError
+from gvm.protocols.core import Response, StatusError
 from gvm.xml import Element, XmlError
 
 

Diff for: gvm/protocols/gmp/core/requests/_resource_names.py renamed to gvm/protocols/gmp/requests/_resource_names.py

@@ -5,13 +5,12 @@
 import unittest
 from unittest.mock import MagicMock
 
-from gvm.protocols.gmp.core import Response
-from gvm.protocols.gmp.core._connection import (
+from gvm.protocols.core import InvalidStateError, Response
+from gvm.protocols.core._connection import (
     AwaitingResponseState,
     Context,
     ErrorState,
     InitialState,
-    InvalidStateError,
     ReceivingDataState,
 )
 

Diff for: gvm/protocols/gmp/core/requests/_version.py renamed to gvm/protocols/gmp/requests/_version.py

@@ -4,7 +4,7 @@
 
 import unittest
 
-from gvm.protocols.gmp.core._connection import XmlReader
+from gvm.protocols.core._connection import XmlReader
 
 
 class XmlReaderTestCase(unittest.TestCase):