Import typing names directly

Author: cdce8p

pylint/checkers/strings.py

@@ -39,7 +39,7 @@
 import numbers
 import re
 import tokenize
-from typing import TYPE_CHECKING, Iterable
+from typing import Counter, Iterable
 
 import astroid
 from astroid import nodes
@@ -48,9 +48,6 @@
 from pylint.checkers.utils import check_messages
 from pylint.interfaces import IAstroidChecker, IRawChecker, ITokenChecker
 
-if TYPE_CHECKING:
-    from typing import Counter  # typing.Counter added in Python 3.6.1
-
 _AST_NODE_STR_TYPES = ("__builtin__.unicode", "__builtin__.str", "builtins.str")
 # Prefixes for both strings and bytes literals per
 # https://docs.python.org/3/reference/lexical_analysis.html#string-and-bytes-literals
@@ -769,8 +766,7 @@ def check_for_consistent_string_delimiters(
         Args:
           tokens: The tokens to be checked against for consistent usage.
         """
-        # typing.Counter added in Python 3.6.1 so this type hint must be a comment
-        string_delimiters = collections.Counter()  # type: Counter[str]
+        string_delimiters: Counter[str] = collections.Counter()
 
         # First, figure out which quote character predominates in the module
         for tok_type, token, _, _, _ in tokens:

pylint/message/message_id_store.py

@@ -1,15 +1,9 @@
 # Licensed under the GPL: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
-import sys
-from typing import Dict, List, Optional, Tuple
+from typing import Dict, List, NoReturn, Optional, Tuple
 
 from pylint.exceptions import InvalidMessageError, UnknownMessageError
 
-if sys.version_info >= (3, 6, 2):
-    from typing import NoReturn
-else:
-    from typing_extensions import NoReturn
-
 
 class MessageIdStore:
 

pylint/testutils/lint_module_test.py

@@ -7,7 +7,8 @@
 import sys
 from collections import Counter
 from io import StringIO
-from typing import TYPE_CHECKING, Dict, List, Optional, TextIO, Tuple
+from typing import Counter as CounterType
+from typing import Dict, List, Optional, TextIO, Tuple
 
 import pytest
 from _pytest.config import Config
@@ -25,10 +26,7 @@
 from pylint.testutils.reporter_for_tests import FunctionalTestReporter
 from pylint.utils import utils
 
-if TYPE_CHECKING:
-    from typing import Counter as CounterType  # typing.Counter added in Python 3.6.1
-
-    MessageCounter = CounterType[Tuple[int, str]]
+MessageCounter = CounterType[Tuple[int, str]]
 
 
 class LintModuleTest:
@@ -96,15 +94,15 @@ def __str__(self) -> str:
         return f"{self._test_file.base} ({self.__class__.__module__}.{self.__class__.__name__})"
 
     @staticmethod
-    def get_expected_messages(stream: TextIO) -> "MessageCounter":
+    def get_expected_messages(stream: TextIO) -> MessageCounter:
         """Parses a file and get expected messages.
 
         :param stream: File-like input stream.
         :type stream: enumerable
         :returns: A dict mapping line,msg-symbol tuples to the count on this line.
         :rtype: dict
         """
-        messages: "MessageCounter" = Counter()
+        messages: MessageCounter = Counter()
         for i, line in enumerate(stream):
             match = _EXPECTED_RE.search(line)
             if match is None:
@@ -130,9 +128,9 @@ def get_expected_messages(stream: TextIO) -> "MessageCounter":
 
     @staticmethod
     def multiset_difference(
-        expected_entries: "MessageCounter",
-        actual_entries: "MessageCounter",
-    ) -> Tuple["MessageCounter", Dict[Tuple[int, str], int]]:
+        expected_entries: MessageCounter,
+        actual_entries: MessageCounter,
+    ) -> Tuple[MessageCounter, Dict[Tuple[int, str], int]]:
         """Takes two multisets and compares them.
 
         A multiset is a dict with the cardinality of the key as the value."""
@@ -161,7 +159,7 @@ def _open_source_file(self) -> TextIO:
             return open(self._test_file.source, encoding="latin1")
         return open(self._test_file.source, encoding="utf8")
 
-    def _get_expected(self) -> Tuple["MessageCounter", List[OutputLine]]:
+    def _get_expected(self) -> Tuple[MessageCounter, List[OutputLine]]:
         with self._open_source_file() as f:
             expected_msgs = self.get_expected_messages(f)
         if not expected_msgs:
@@ -172,10 +170,10 @@ def _get_expected(self) -> Tuple["MessageCounter", List[OutputLine]]:
             ]
         return expected_msgs, expected_output_lines
 
-    def _get_actual(self) -> Tuple["MessageCounter", List[OutputLine]]:
+    def _get_actual(self) -> Tuple[MessageCounter, List[OutputLine]]:
         messages: List[Message] = self._linter.reporter.messages
         messages.sort(key=lambda m: (m.line, m.symbol, m.msg))
-        received_msgs: "MessageCounter" = Counter()
+        received_msgs: MessageCounter = Counter()
         received_output_lines = []
         for msg in messages:
             assert (
@@ -200,8 +198,8 @@ def _runTest(self) -> None:
 
     def error_msg_for_unequal_messages(
         self,
-        actual_messages: "MessageCounter",
-        expected_messages: "MessageCounter",
+        actual_messages: MessageCounter,
+        expected_messages: MessageCounter,
         actual_output: List[OutputLine],
     ) -> str:
         msg = [f'Wrong results for file "{self._test_file.base}":']
@@ -246,7 +244,7 @@ def error_msg_for_unequal_output(
 
     def _check_output_text(
         self,
-        _: "MessageCounter",
+        _: MessageCounter,
         expected_output: List[OutputLine],
         actual_output: List[OutputLine],
     ) -> None:

tests/lint/test_pylinter.py

@@ -1,5 +1,4 @@
-import sys
-from typing import Any
+from typing import Any, NoReturn
 from unittest.mock import patch
 
 from _pytest.capture import CaptureFixture
@@ -9,11 +8,6 @@
 from pylint.lint.pylinter import PyLinter
 from pylint.utils import FileState
 
-if sys.version_info >= (3, 6, 2):
-    from typing import NoReturn
-else:
-    from typing_extensions import NoReturn
-
 
 def raise_exception(*args: Any, **kwargs: Any) -> NoReturn:
     raise AstroidBuildingError(modname="spam")