Merge pull request #153 from pebenito/fix-unused-ignore

various: Fix issues from new mypy.

Author: pebenito

sesearch

@@ -175,8 +175,7 @@ try:
             terq.perms = args.perms.split(",")
 
         if args.xperms:
-            # https://github.com/python/mypy/issues/220
-            terq.xperms = setools.xperm_str_to_tuple_ranges(args.xperms)  # type: ignore
+            terq.xperms = setools.xperm_str_to_tuple_ranges(args.xperms)
 
         if args.boolean:
             if args.boolean_regex:

setools/ibpkeyconquery.py

@@ -63,11 +63,11 @@ def pkeys(self) -> policyrep.IbpkeyconRange | None:
         return self._pkeys
 
     @pkeys.setter
-    def pkeys(self, value: tuple[int, int] | None) -> None:
-        if value:
-            self._pkeys = policyrep.IbpkeyconRange(*value)
+    def pkeys(self, value: policyrep.IbpkeyconRange | tuple[int, int] | None) -> None:
+        if isinstance(value, policyrep.IbpkeyconRange):
+            self._pkeys = value
         else:
-            self._pkeys = None
+            self._pkeys = policyrep.IbpkeyconRange(*value) if value else None
 
     @property
     def subnet_prefix(self) -> IPv6Address | None:

setools/portconquery.py

@@ -68,11 +68,11 @@ def ports(self) -> policyrep.PortconRange | None:
         return self._ports
 
     @ports.setter
-    def ports(self, value: tuple[int, int] | None) -> None:
-        if value:
-            self._ports = policyrep.PortconRange(*value)
+    def ports(self, value: policyrep.PortconRange | tuple[int, int] | None) -> None:
+        if isinstance(value, policyrep.PortconRange):
+            self._ports = value
         else:
-            self._ports = None
+            self._ports = policyrep.PortconRange(*value) if value else None
 
     @property
     def protocol(self) -> policyrep.PortconProtocol | None:

tests/library/test_dta.py

@@ -401,7 +401,7 @@ def test_exclude_domain(self, analysis: setools.DomainTransitionAnalysis) -> Non
         # removed after removing invalid domain transitions
 
         analysis.reverse = False
-        analysis.exclude = ["trans1"]  # type: ignore[list-item]
+        analysis.exclude = ["trans1"]
         analysis._build_subgraph()
 
         start = analysis.policy.lookup_type("start")
@@ -424,7 +424,7 @@ def test_exclude_entryoint_with_2entrypoints(
         # removed after removing invalid domain transitions
 
         analysis.reverse = False
-        analysis.exclude = ["trans3_exec1"]  # type: ignore[list-item]
+        analysis.exclude = ["trans3_exec1"]
         analysis._build_subgraph()
 
         start = analysis.policy.lookup_type("start")
@@ -450,7 +450,7 @@ def test_exclude_entryoint_with_dyntrans(
         # removed after removing invalid domain transitions
 
         analysis.reverse = False
-        analysis.exclude = ["bothtrans200_exec"]  # type: ignore[list-item]
+        analysis.exclude = ["bothtrans200_exec"]
         analysis._build_subgraph()
 
         start = analysis.policy.lookup_type("start")
@@ -476,7 +476,7 @@ def test_exclude_entryoint_delete_transition(
         # removed after removing invalid domain transitions
 
         analysis.reverse = False
-        analysis.exclude = ["trans2_exec"]  # type: ignore[list-item]
+        analysis.exclude = ["trans2_exec"]
         analysis._build_subgraph()
 
         start = analysis.policy.lookup_type("start")
@@ -759,7 +759,7 @@ def test_set_exclude_invalid_type(self, analysis: setools.DomainTransitionAnalys
         analysis.reverse = False
         analysis.exclude = []
         with pytest.raises(setools.exception.InvalidType):
-            analysis.exclude = ["trans1", "invalid_type"]  # type: ignore[list-item]
+            analysis.exclude = ["trans1", "invalid_type"]
 
     def test_all_paths_invalid_source(self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all paths with invalid source type."""
@@ -788,7 +788,7 @@ def test_all_paths_invalid_maxlen(self, analysis: setools.DomainTransitionAnalys
     def test_all_paths_source_excluded(self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all paths with excluded source type."""
         analysis.reverse = False
-        analysis.exclude = ["trans1"]  # type: ignore[list-item]
+        analysis.exclude = ["trans1"]
         analysis.source = "trans1"
         analysis.target = "trans2"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.AllPaths
@@ -798,7 +798,7 @@ def test_all_paths_source_excluded(self, analysis: setools.DomainTransitionAnaly
     def test_all_paths_target_excluded(self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all paths with excluded target type."""
         analysis.reverse = False
-        analysis.exclude = ["trans2"]  # type: ignore[list-item]
+        analysis.exclude = ["trans2"]
         analysis.source = "trans1"
         analysis.target = "trans2"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.AllPaths
@@ -820,7 +820,7 @@ def test_all_paths_target_disconnected(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all paths with disconnected target type."""
         analysis.reverse = False
-        analysis.exclude = ["trans3"]  # type: ignore[list-item]
+        analysis.exclude = ["trans3"]
         analysis.source = "trans2"
         analysis.target = "trans5"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.AllPaths
@@ -831,7 +831,7 @@ def test_shortest_path_target_disconnected(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: shortest path with disconnected target type."""
         analysis.reverse = False
-        analysis.exclude = ["trans3"]  # type: ignore[list-item]
+        analysis.exclude = ["trans3"]
         analysis.source = "trans2"
         analysis.target = "trans5"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.ShortestPaths
@@ -842,7 +842,7 @@ def test_all_shortest_paths_source_excluded(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all shortest paths with excluded source type."""
         analysis.reverse = False
-        analysis.exclude = ["trans1"]  # type: ignore[list-item]
+        analysis.exclude = ["trans1"]
         analysis.source = "trans1"
         analysis.target = "trans2"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.ShortestPaths
@@ -853,7 +853,7 @@ def test_all_shortest_paths_target_excluded(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all shortest paths with excluded target type."""
         analysis.reverse = False
-        analysis.exclude = ["trans2"]  # type: ignore[list-item]
+        analysis.exclude = ["trans2"]
         analysis.source = "trans1"
         analysis.target = "trans2"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.ShortestPaths
@@ -875,7 +875,7 @@ def test_all_shortest_paths_target_disconnected(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: all shortest paths with disconnected target type."""
         analysis.reverse = False
-        analysis.exclude = ["trans3"]  # type: ignore[list-item]
+        analysis.exclude = ["trans3"]
         analysis.source = "trans2"
         analysis.target = "trans5"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.ShortestPaths
@@ -885,7 +885,7 @@ def test_all_shortest_paths_target_disconnected(
     def test_transitions_source_excluded(self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: transitions with excluded source type."""
         analysis.reverse = False
-        analysis.exclude = ["trans1"]  # type: ignore[list-item]
+        analysis.exclude = ["trans1"]
         analysis.mode = setools.DomainTransitionAnalysis.Mode.TransitionsOut
         analysis.source = "trans1"
         paths = list(analysis.results())
@@ -895,7 +895,7 @@ def test_transitions_source_disconnected(
             self, analysis: setools.DomainTransitionAnalysis) -> None:
         """DTA: transitions with disconnected source type."""
         analysis.reverse = False
-        analysis.exclude = ["trans3"]  # type: ignore[list-item]
+        analysis.exclude = ["trans3"]
         analysis.source = "trans5"
         analysis.mode = setools.DomainTransitionAnalysis.Mode.TransitionsOut
         paths = list(analysis.results())

tests/library/test_infoflow.py

@@ -292,7 +292,7 @@ def test_infoflows_in(self, analysis: setools.InfoFlowAnalysis) -> None:
     def test_set_exclude_invalid_type(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: set invalid excluded type."""
         with pytest.raises(setools.exception.InvalidType):
-            analysis.exclude = ["node1", "invalid_type"]  # type: ignore[list-item]
+            analysis.exclude = ["node1", "invalid_type"]
 
     def test_set_small_min_weight(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: set too small weight."""
@@ -332,7 +332,7 @@ def test_all_paths_invalid_maxlen(self, analysis: setools.InfoFlowAnalysis) -> N
 
     def test_all_paths_source_excluded(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: all paths with excluded source type."""
-        analysis.exclude = ["node1"]  # type: ignore[list-item]
+        analysis.exclude = ["node1"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.AllPaths
         analysis.source = "node1"
@@ -342,7 +342,7 @@ def test_all_paths_source_excluded(self, analysis: setools.InfoFlowAnalysis) ->
 
     def test_all_paths_target_excluded(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: all paths with excluded target type."""
-        analysis.exclude = ["node2"]  # type: ignore[list-item]
+        analysis.exclude = ["node2"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.AllPaths
         analysis.source = "node1"
@@ -372,7 +372,7 @@ def test_all_paths_target_disconnected(self, analysis: setools.InfoFlowAnalysis)
 
     def test_all_shortest_paths_source_excluded(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: all shortest paths with excluded source type."""
-        analysis.exclude = ["node1"]  # type: ignore[list-item]
+        analysis.exclude = ["node1"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.ShortestPaths
         analysis.source = "node1"
@@ -382,7 +382,7 @@ def test_all_shortest_paths_source_excluded(self, analysis: setools.InfoFlowAnal
 
     def test_all_shortest_paths_target_excluded(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: all shortest paths with excluded target type."""
-        analysis.exclude = ["node2"]  # type: ignore[list-item]
+        analysis.exclude = ["node2"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.ShortestPaths
         analysis.source = "node1"
@@ -414,7 +414,7 @@ def test_all_shortest_paths_target_disconnected(
 
     def test_infoflows_source_excluded(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: infoflows with excluded source type."""
-        analysis.exclude = ["node1"]  # type: ignore[list-item]
+        analysis.exclude = ["node1"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.FlowsOut
         analysis.source = "node1"
@@ -423,7 +423,7 @@ def test_infoflows_source_excluded(self, analysis: setools.InfoFlowAnalysis) ->
 
     def test_infoflows_source_disconnected(self, analysis: setools.InfoFlowAnalysis) -> None:
         """Information flow analysis: infoflows with disconnected source type."""
-        analysis.exclude = ["disconnected2"]  # type: ignore[list-item]
+        analysis.exclude = ["disconnected2"]
         analysis.min_weight = 1
         analysis.mode = setools.InfoFlowAnalysis.Mode.FlowsOut
         analysis.source = "disconnected1"