ansible-test - Simplify type hints.

ansible · Mar 4, 2022 · af2b136 · af2b136
1 parent ea66cf1
commit af2b136
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/__init__.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/__init__.py
@@ -18,14 +18,13 @@
     CoverageAnalyzeConfig,
 )
 
-if t.TYPE_CHECKING:
-    TargetKey = t.TypeVar('TargetKey', int, t.Tuple[int, int])
-    NamedPoints = t.Dict[str, t.Dict[TargetKey, t.Set[str]]]
-    IndexedPoints = t.Dict[str, t.Dict[TargetKey, t.Set[int]]]
-    Arcs = t.Dict[str, t.Dict[t.Tuple[int, int], t.Set[int]]]
-    Lines = t.Dict[str, t.Dict[int, t.Set[int]]]
-    TargetIndexes = t.Dict[str, int]
-    TargetSetIndexes = t.Dict[t.FrozenSet[int], int]
+TargetKey = t.TypeVar('TargetKey', int, t.Tuple[int, int])
+NamedPoints = t.Dict[str, t.Dict[TargetKey, t.Set[str]]]
+IndexedPoints = t.Dict[str, t.Dict[TargetKey, t.Set[int]]]
+Arcs = t.Dict[str, t.Dict[t.Tuple[int, int], t.Set[int]]]
+Lines = t.Dict[str, t.Dict[int, t.Set[int]]]
+TargetIndexes = t.Dict[str, int]
+TargetSetIndexes = t.Dict[t.FrozenSet[int], int]
 
 
 class CoverageAnalyzeTargetsConfig(CoverageAnalyzeConfig):

diff --git a/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/combine.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/combine.py
@@ -18,13 +18,12 @@
     write_report,
 )
 
-if t.TYPE_CHECKING:
-    from . import (
-        Arcs,
-        IndexedPoints,
-        Lines,
-        TargetIndexes,
-    )
+from . import (
+    Arcs,
+    IndexedPoints,
+    Lines,
+    TargetIndexes,
+)
 
 
 class CoverageAnalyzeTargetsCombineConfig(CoverageAnalyzeTargetsConfig):

diff --git a/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/filter.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/filter.py
@@ -21,11 +21,10 @@
     write_report,
 )
 
-if t.TYPE_CHECKING:
-    from . import (
-        NamedPoints,
-        TargetIndexes,
-    )
+from . import (
+    NamedPoints,
+    TargetIndexes,
+)
 
 
 class CoverageAnalyzeTargetsFilterConfig(CoverageAnalyzeTargetsConfig):

diff --git a/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/generate.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/generate.py
@@ -43,12 +43,11 @@
     write_report,
 )
 
-if t.TYPE_CHECKING:
-    from . import (
-        Arcs,
-        Lines,
-        TargetIndexes,
-    )
+from . import (
+    Arcs,
+    Lines,
+    TargetIndexes,
+)
 
 
 class CoverageAnalyzeTargetsGenerateConfig(CoverageAnalyzeTargetsConfig):

diff --git a/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/missing.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/missing.py
@@ -24,11 +24,10 @@
     write_report,
 )
 
-if t.TYPE_CHECKING:
-    from . import (
-        TargetIndexes,
-        IndexedPoints,
-    )
+from . import (
+    TargetIndexes,
+    IndexedPoints,
+)
 
 
 class CoverageAnalyzeTargetsMissingConfig(CoverageAnalyzeTargetsConfig):