From a080aef0f025169cc1bdbe19ebc54cf24bc54c93 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Tue, 19 Apr 2022 11:21:02 -0400 Subject: [PATCH] Fix `AstroidError` in similarity checker with imports/signatures ignored (#6357) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Daniël van Noord <13665637+DanielNoord@users.noreply.github.com> --- pylint/checkers/similar.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pylint/checkers/similar.py b/pylint/checkers/similar.py index 876dd69ccc0..a876091e84d 100644 --- a/pylint/checkers/similar.py +++ b/pylint/checkers/similar.py @@ -35,6 +35,7 @@ from typing import ( TYPE_CHECKING, Any, + Callable, Dict, List, NamedTuple, @@ -375,10 +376,10 @@ def append_stream( LineSet( streamid, lines, - self.namespace.ignore_comments, - self.namespace.ignore_docstrings, - self.namespace.ignore_imports, - self.namespace.ignore_signatures, + self.ignore_comments, + self.ignore_docstrings, + self.ignore_imports, + self.ignore_signatures, line_enabled_callback=self.linter._is_one_message_enabled # type: ignore[attr-defined] if hasattr(self, "linter") else None, @@ -559,8 +560,8 @@ def stripped_lines( ignore_docstrings: bool, ignore_imports: bool, ignore_signatures: bool, - line_enabled_callback: Callable[[str, int], bool] | None = None, -) -> list[LineSpecifs]: + line_enabled_callback: Union[Callable[[str, int], bool], None] = None, +) -> List[LineSpecifs]: """Return tuples of line/line number/line type with leading/trailing whitespace and any ignored code features removed. :param lines: a collection of lines @@ -670,7 +671,7 @@ def __init__( ignore_docstrings: bool = False, ignore_imports: bool = False, ignore_signatures: bool = False, - line_enabled_callback: Callable[[str, int], bool] | None = None, + line_enabled_callback: Union[Callable[[str, int], bool], None] = None, ) -> None: self.name = name self._real_lines = lines