Remove utils.subscriptable_with_postponed_evaluation_enabled (#6607)

Author: cdce8p

ChangeLog

@@ -314,7 +314,8 @@ Release date: TBA
   Closes #6597
 
 * ``is_class_subscriptable_pep585_with_postponed_evaluation_enabled`` has been deprecated.
-  Use ``subscriptable_with_postponed_evaluation_enabled`` instead.
+  Use ``is_postponed_evaluation_enabled(node) and is_node_in_type_annotation_context(node)``
+  instead.
 
   Ref #6536
 

doc/whatsnew/2.14.rst

@@ -215,7 +215,6 @@ Other Changes
 
 * The ``set_config_directly`` decorator has been removed.
 
-
 * Fix falsely issuing ``useless-suppression`` on the ``wrong-import-position`` checker.
 
   Closes #5219
@@ -253,11 +252,6 @@ Other Changes
 
   Closes #6597
 
-* ``is_class_subscriptable_pep585_with_postponed_evaluation_enabled`` has been deprecated.
-  Use ``subscriptable_with_postponed_evaluation_enabled`` instead.
-
-  Ref #6536
-
 * The refactoring checker now also raises 'consider-using-a-generator' messages for
   ``max()``, ``min()`` and ``sum()``.
 
@@ -371,3 +365,9 @@ Deprecations
   be removed in a future release.
 
   Ref #5392
+
+* ``is_class_subscriptable_pep585_with_postponed_evaluation_enabled`` has been deprecated.
+  Use ``is_postponed_evaluation_enabled(node) and is_node_in_type_annotation_context(node)``
+  instead.
+
+  Ref #6536

pylint/checkers/utils.py

@@ -1217,7 +1217,9 @@ def supports_getitem(value: nodes.NodeNG, node: nodes.NodeNG) -> bool:
     if isinstance(value, nodes.ClassDef):
         if _supports_protocol_method(value, CLASS_GETITEM_METHOD):
             return True
-        if subscriptable_with_postponed_evaluation_enabled(node):
+        if is_postponed_evaluation_enabled(node) and is_node_in_type_annotation_context(
+            node
+        ):
             return True
     return _supports_protocol(value, _supports_getitem_protocol)
 
@@ -1405,7 +1407,8 @@ def is_class_subscriptable_pep585_with_postponed_evaluation_enabled(
     warnings.warn(
         "'is_class_subscriptable_pep585_with_postponed_evaluation_enabled' has been "
         "deprecated and will be removed in pylint 3.0. "
-        "Use 'subscriptable_with_postponed_evaluation_enabled' instead.",
+        "Use 'is_postponed_evaluation_enabled(node) and "
+        "is_node_in_type_annotation_context(node)' instead.",
         DeprecationWarning,
     )
     return (
@@ -1415,13 +1418,6 @@ def is_class_subscriptable_pep585_with_postponed_evaluation_enabled(
     )
 
 
-def subscriptable_with_postponed_evaluation_enabled(node: nodes.NodeNG) -> bool:
-    """Check if class can be subscriptable in type annotation context."""
-    return is_postponed_evaluation_enabled(node) and is_node_in_type_annotation_context(
-        node
-    )
-
-
 def is_node_in_type_annotation_context(node: nodes.NodeNG) -> bool:
     """Check if node is in type annotation context.