diff --git a/pylint/checkers/imports.py b/pylint/checkers/imports.py index 3de762aed4f..1f71f37f776 100644 --- a/pylint/checkers/imports.py +++ b/pylint/checkers/imports.py @@ -488,23 +488,15 @@ def close(self) -> None: for cycle in get_cycles(graph, vertices=vertices): self.add_message("cyclic-import", args=" -> ".join(cycle)) - def get_map_data( - self, - ) -> tuple[defaultdict[str, set[str]], defaultdict[str, set[str]]]: - return (self.import_graph, self._excluded_edges) + def get_map_data(self) -> defaultdict[str, set[str]]: + return self.import_graph def reduce_map_data( - self, - linter: PyLinter, - data: list[tuple[defaultdict[str, set[str]], defaultdict[str, set[str]]]], + self, linter: PyLinter, data: list[defaultdict[str, set[str]]] ) -> None: self.import_graph = defaultdict(set) - self._excluded_edges = defaultdict(set) - for to_update in data: - graph, excluded_edges = to_update + for graph in data: self.import_graph.update(graph) - self._excluded_edges.update(excluded_edges) - self.close() def deprecated_modules(self) -> set[str]: diff --git a/tests/test_check_parallel.py b/tests/test_check_parallel.py index 4d1a0657955..eadfaea6f6e 100644 --- a/tests/test_check_parallel.py +++ b/tests/test_check_parallel.py @@ -655,30 +655,3 @@ def test_cyclic_import_parallel(self) -> None: ) assert "cyclic-import" in linter.stats.by_msg - - @pytest.mark.needs_two_cores - def test_cyclic_import_parallel_disabled(self) -> None: - tests_dir = Path("tests") - package_path = Path("input") / "func_noerror_cycle" - linter = PyLinter(reporter=Reporter()) - linter.register_checker(ImportsChecker(linter)) - - with _test_cwd(tests_dir): - check_parallel( - linter, - jobs=2, - files=[ - FileItem( - name="input.func_noerror_cycle.a", - filepath=str(package_path / "a.py"), - modpath="input.func_noerror_cycle", - ), - FileItem( - name="input.func_noerror_cycle.b", - filepath=str(package_path / "b.py"), - modpath="input.func_noerror_cycle", - ), - ], - ) - - assert "cyclic-import" not in linter.stats.by_msg