Clean up imports

timopollmeier · bjoernricks · commit 32491f74627b · 2025-04-16T09:31:35.000+02:00
diff --git a/gvm/protocols/gmp/_gmp227.py b/gvm/protocols/gmp/_gmp227.py
@@ -6,7 +6,7 @@
 Greenbone Management Protocol (GMP) version 22.7
 """
 
-from typing import Optional, Sequence, Union
+from typing import Optional, Union
 
 from .._protocol import T
 from ._gmp226 import GMPv226
diff --git a/gvm/protocols/gmp/requests/v226/__init__.py b/gvm/protocols/gmp/requests/v226/__init__.py
@@ -47,9 +47,9 @@
     ReportFormatType,
     Results,
     Roles,
-    ScannerType,
-    Scanners,
     ScanConfigs,
+    Scanners,
+    ScannerType,
     Schedules,
     SecInfo,
     Severity,
diff --git a/gvm/protocols/gmp/requests/v227/__init__.py b/gvm/protocols/gmp/requests/v227/__init__.py
@@ -6,6 +6,8 @@
 GMP Request implementations for GMP version 22.7.
 """
 
+from gvm.protocols.gmp.requests.v227._scanners import Scanners, ScannerType
+
 from .._entity_id import EntityID
 from .._version import Version
 from ..v226 import (
@@ -46,8 +48,8 @@
     Policies,
     PortLists,
     PortRangeType,
-    ReportConfigs,
     ReportConfigParameter,
+    ReportConfigs,
     ReportFormats,
     ReportFormatType,
     Reports,
@@ -76,8 +78,6 @@
     Vulnerabilities,
 )
 
-from gvm.protocols.gmp.requests.v227._scanners import Scanners, ScannerType
-
 __all__ = (
     "Aggregates",
     "AggregateStatistic",
diff --git a/tests/protocols/gmpv227/entities/scanners/__init__.py b/tests/protocols/gmpv227/entities/scanners/__init__.py
@@ -3,15 +3,16 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
+from ....gmpv224.entities.scanners import (
+    GmpCloneScannerTestMixin,
+    GmpDeleteScannerTestMixin,
+    GmpGetScannersTestMixin,
+    GmpGetScannerTestMixin,
+    GmpVerifyScannerTestMixin,
+)
 from .test_create_scanner import GmpCreateScannerTestMixin
 from .test_modify_scanner import GmpModifyScannerTestMixin
 
-from ....gmpv224.entities.scanners import GmpCloneScannerTestMixin
-from ....gmpv224.entities.scanners import GmpDeleteScannerTestMixin
-from ....gmpv224.entities.scanners import GmpGetScannerTestMixin
-from ....gmpv224.entities.scanners import GmpGetScannersTestMixin
-from ....gmpv224.entities.scanners import GmpVerifyScannerTestMixin
-
 __all__ = (
     "GmpCloneScannerTestMixin",
     "GmpCreateScannerTestMixin",
diff --git a/tests/protocols/gmpv227/entities/test_audit_reports.py b/tests/protocols/gmpv227/entities/test_audit_reports.py
@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-from ...gmpv227 import GMPTestCase
 from ...gmpv226.entities.audit_reports import (
     GmpDeleteAuditReportTestMixin,
     GmpGetAuditReportsTestMixin,
     GmpGetAuditReportTestMixin,
 )
+from ...gmpv227 import GMPTestCase
 
 
 class GMPDeleteAuditReportTestCase(GmpDeleteAuditReportTestMixin, GMPTestCase):
diff --git a/tests/protocols/gmpv227/entities/test_report_configs.py b/tests/protocols/gmpv227/entities/test_report_configs.py
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-from ...gmpv227 import GMPTestCase
 from ...gmpv226.entities.report_configs import (
     GMPCloneReportConfigTestMixin,
     GMPCreateReportConfigTestMixin,
@@ -12,6 +11,7 @@
     GMPGetReportConfigTestMixin,
     GMPModifyReportConfigTestMixin,
 )
+from ...gmpv227 import GMPTestCase
 
 
 class GMPCloneReportConfigTestCase(GMPCloneReportConfigTestMixin, GMPTestCase):
diff --git a/tests/protocols/gmpv227/entities/test_reports.py b/tests/protocols/gmpv227/entities/test_reports.py
@@ -3,13 +3,13 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-from ...gmpv227 import GMPTestCase
 from ...gmpv226.entities.reports import (
     GmpDeleteReportTestMixin,
     GmpGetReportsTestMixin,
     GmpGetReportTestMixin,
     GmpImportReportTestMixin,
 )
+from ...gmpv227 import GMPTestCase
 
 
 class GMPDeleteReportTestCase(GmpDeleteReportTestMixin, GMPTestCase):
diff --git a/tests/protocols/gmpv227/entities/test_resource_names.py b/tests/protocols/gmpv227/entities/test_resource_names.py
@@ -3,11 +3,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 #
 
-from ...gmpv227 import GMPTestCase
 from ...gmpv226.entities.resourcenames import (
     GmpGetResourceNamesListTestMixin,
     GmpGetResourceNameTestMixin,
 )
+from ...gmpv227 import GMPTestCase
 
 
 class GMPGetResourceNamesListTestCase(
diff --git a/tests/protocols/gmpv227/entities/test_scanners.py b/tests/protocols/gmpv227/entities/test_scanners.py
@@ -2,11 +2,9 @@
 #
 #  SPDX-License-Identifier: GPL-3.0-or-later
 #
-#  SPDX-License-Identifier: GPL-3.0-or-later
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
 
+
+from tests.protocols.gmpv227 import GMPTestCase
 from tests.protocols.gmpv227.entities.scanners import (
     GmpCloneScannerTestMixin,
     GmpCreateScannerTestMixin,
@@ -15,7 +13,6 @@
     GmpGetScannerTestMixin,
     GmpModifyScannerTestMixin,
 )
-from tests.protocols.gmpv227 import GMPTestCase
 
 
 class GMPDeleteScannerTestCase(GmpDeleteScannerTestMixin, GMPTestCase):

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,12 @@`
`3`	`3`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`4`	`4`	`#`
`5`	`5`
`6`		`-from ...gmpv227 import GMPTestCase`
`7`	`6`	`from ...gmpv226.entities.audit_reports import (`
`8`	`7`	`GmpDeleteAuditReportTestMixin,`
`9`	`8`	`GmpGetAuditReportsTestMixin,`
`10`	`9`	`GmpGetAuditReportTestMixin,`
`11`	`10`	`)`
	`11`	`+from ...gmpv227 import GMPTestCase`
`12`	`12`
`13`	`13`
`14`	`14`	`class GMPDeleteAuditReportTestCase(GmpDeleteAuditReportTestMixin, GMPTestCase):`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`4`	`4`	`#`
`5`	`5`
`6`		`-from ...gmpv227 import GMPTestCase`
`7`	`6`	`from ...gmpv226.entities.report_configs import (`
`8`	`7`	`GMPCloneReportConfigTestMixin,`
`9`	`8`	`GMPCreateReportConfigTestMixin,`
`@@ -12,6 +11,7 @@`
`12`	`11`	`GMPGetReportConfigTestMixin,`
`13`	`12`	`GMPModifyReportConfigTestMixin,`
`14`	`13`	`)`
	`14`	`+from ...gmpv227 import GMPTestCase`
`15`	`15`
`16`	`16`
`17`	`17`	`class GMPCloneReportConfigTestCase(GMPCloneReportConfigTestMixin, GMPTestCase):`
Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,13 @@`
`3`	`3`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`4`	`4`	`#`
`5`	`5`
`6`		`-from ...gmpv227 import GMPTestCase`
`7`	`6`	`from ...gmpv226.entities.reports import (`
`8`	`7`	`GmpDeleteReportTestMixin,`
`9`	`8`	`GmpGetReportsTestMixin,`
`10`	`9`	`GmpGetReportTestMixin,`
`11`	`10`	`GmpImportReportTestMixin,`
`12`	`11`	`)`
	`12`	`+from ...gmpv227 import GMPTestCase`
`13`	`13`
`14`	`14`
`15`	`15`	`class GMPDeleteReportTestCase(GmpDeleteReportTestMixin, GMPTestCase):`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`4`	`4`	`#`
`5`	`5`
`6`		`-from ...gmpv227 import GMPTestCase`
`7`	`6`	`from ...gmpv226.entities.resourcenames import (`
`8`	`7`	`GmpGetResourceNamesListTestMixin,`
`9`	`8`	`GmpGetResourceNameTestMixin,`
`10`	`9`	`)`
	`10`	`+from ...gmpv227 import GMPTestCase`
`11`	`11`
`12`	`12`
`13`	`13`	`class GMPGetResourceNamesListTestCase(`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,9 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: GPL-3.0-or-later`
`4`	`4`	`#`
`5`		`-# SPDX-License-Identifier: GPL-3.0-or-later`
`6`		`-#`
`7`		`-# SPDX-License-Identifier: GPL-3.0-or-later`
`8`		`-#`
`9`	`5`
	`6`	`+`
	`7`	`+from tests.protocols.gmpv227 import GMPTestCase`
`10`	`8`	`from tests.protocols.gmpv227.entities.scanners import (`
`11`	`9`	`GmpCloneScannerTestMixin,`
`12`	`10`	`GmpCreateScannerTestMixin,`
`@@ -15,7 +13,6 @@`
`15`	`13`	`GmpGetScannerTestMixin,`
`16`	`14`	`GmpModifyScannerTestMixin,`
`17`	`15`	`)`
`18`		`-from tests.protocols.gmpv227 import GMPTestCase`
`19`	`16`
`20`	`17`
`21`	`18`	`class GMPDeleteScannerTestCase(GmpDeleteScannerTestMixin, GMPTestCase):`