Remove PY39_PLUS constant

Author: jacobtylerwalls

pylint/checkers/nested_min_max.py

@@ -14,7 +14,6 @@
 
 from pylint.checkers import BaseChecker
 from pylint.checkers.utils import only_required_for_messages, safe_infer
-from pylint.constants import PY39_PLUS
 from pylint.interfaces import INFERENCE
 
 if TYPE_CHECKING:
@@ -139,8 +138,8 @@ def _is_splattable_expression(self, arg: nodes.NodeNG) -> bool:
             return self._is_splattable_expression(
                 arg.left
             ) and self._is_splattable_expression(arg.right)
-        # Support dict merge (operator __or__ in Python 3.9)
-        if isinstance(arg, nodes.BinOp) and arg.op == "|" and PY39_PLUS:
+        # Support dict merge (operator __or__)
+        if isinstance(arg, nodes.BinOp) and arg.op == "|":
             return self._is_splattable_expression(
                 arg.left
             ) and self._is_splattable_expression(arg.right)

pylint/checkers/variables.py

@@ -32,7 +32,7 @@
     is_sys_guard,
     overridden_method,
 )
-from pylint.constants import PY39_PLUS, PY311_PLUS, TYPING_NEVER, TYPING_NORETURN
+from pylint.constants import PY311_PLUS, TYPING_NEVER, TYPING_NORETURN
 from pylint.interfaces import CONTROL_FLOW, HIGH, INFERENCE, INFERENCE_FAILURE
 from pylint.typing import MessageDefinitionTuple
 
@@ -2350,23 +2350,6 @@ def _is_variable_violation(
                             and defnode.col_offset < node.col_offset
                         )
                         or (defnode.lineno < node.lineno)
-                        or (
-                            # Issue in the `ast` module until py39
-                            # Nodes in a multiline string have the same lineno
-                            # Could be false-positive without check
-                            not PY39_PLUS
-                            and defnode.lineno == node.lineno
-                            and isinstance(
-                                defstmt,
-                                (
-                                    nodes.Assign,
-                                    nodes.AnnAssign,
-                                    nodes.AugAssign,
-                                    nodes.Return,
-                                ),
-                            )
-                            and isinstance(defstmt.value, nodes.JoinedStr)
-                        )
                     )
                 ):
                     # Relation of a name to the same name in a named expression

pylint/constants.py

@@ -14,7 +14,6 @@
 from pylint.__pkginfo__ import __version__
 from pylint.typing import MessageTypesFullName
 
-PY39_PLUS = sys.version_info[:2] >= (3, 9)
 PY310_PLUS = sys.version_info[:2] >= (3, 10)
 PY311_PLUS = sys.version_info[:2] >= (3, 11)
 PY312_PLUS = sys.version_info[:2] >= (3, 12)

pylint/testutils/checker_test_case.py

@@ -10,7 +10,6 @@
 
 from astroid import nodes
 
-from pylint.constants import IS_PYPY, PY39_PLUS
 from pylint.testutils.global_test_linter import linter
 from pylint.testutils.output_line import MessageTest
 from pylint.testutils.unittest_linter import UnittestLinter
@@ -76,9 +75,8 @@ def assertAddsMessages(
 
             assert expected_msg.line == gotten_msg.line, msg
             assert expected_msg.col_offset == gotten_msg.col_offset, msg
-            if not IS_PYPY or PY39_PLUS:
-                assert expected_msg.end_line == gotten_msg.end_line, msg
-                assert expected_msg.end_col_offset == gotten_msg.end_col_offset, msg
+            assert expected_msg.end_line == gotten_msg.end_line, msg
+            assert expected_msg.end_col_offset == gotten_msg.end_col_offset, msg
 
     def walk(self, node: nodes.NodeNG) -> None:
         """Recursive walk on the given node."""

tests/checkers/unittest_symilar.py

@@ -9,7 +9,6 @@
 import pytest
 
 from pylint.checkers import symilar
-from pylint.constants import IS_PYPY, PY39_PLUS
 from pylint.lint import PyLinter
 from pylint.testutils import GenericTestReporter as Reporter
 
@@ -131,10 +130,6 @@ def test_multiline_imports() -> None:
     )
 
 
-@pytest.mark.skipif(
-    IS_PYPY and not PY39_PLUS,
-    reason="Requires accurate 'end_lineno' value",
-)
 def test_ignore_multiline_imports() -> None:
     output = StringIO()
     with redirect_stdout(output), pytest.raises(SystemExit) as ex:

tests/testutils/test_lint_module_output_update.py

@@ -12,7 +12,6 @@
 
 import pytest
 
-from pylint.constants import IS_PYPY, PY39_PLUS
 from pylint.testutils import FunctionalTestFile, LintModuleTest
 from pylint.testutils.functional import LintModuleOutputUpdate
 
@@ -72,10 +71,6 @@ def test_lint_module_output_update_remove_useless_txt(
     assert not expected_output_file.exists()
 
 
-@pytest.mark.skipif(
-    IS_PYPY and not PY39_PLUS,
-    reason="Requires accurate 'end_col' value to update output",
-)
 @pytest.mark.parametrize(
     "directory_path", DIRECTORIES, ids=[str(p) for p in DIRECTORIES]
 )