Small typing improvements (#1435)

Author: cdce8p

astroid/nodes/node_classes.py

@@ -52,6 +52,7 @@
     ClassVar,
     Generator,
     Optional,
+    Type,
     TypeVar,
     Union,
 )
@@ -685,7 +686,7 @@ def __init__(
         self.kwarg: Optional[str] = kwarg  # can be None
         """The name of the variable length keyword arguments."""
 
-        self.args: typing.Optional[typing.List[AssignName]]
+        self.args: Optional[typing.List[AssignName]]
         """The names of the required arguments.
 
         Can be None if the associated function does not have a retrievable
@@ -1935,7 +1936,7 @@ class Const(mixins.NoChildrenMixin, NodeNG, Instance):
 
     def __init__(
         self,
-        value: typing.Any,
+        value: Any,
         lineno: Optional[int] = None,
         col_offset: Optional[int] = None,
         parent: Optional[NodeNG] = None,
@@ -1961,7 +1962,7 @@ def __init__(
         :param end_col_offset: The end column this node appears on in the
             source code. Note: This is after the last symbol.
         """
-        self.value: typing.Any = value
+        self.value: Any = value
         """The value that the constant represents."""
 
         self.kind: Optional[str] = kind  # can be None
@@ -4100,7 +4101,7 @@ def __init__(
         :param end_col_offset: The end column this node appears on in the
             source code. Note: This is after the last symbol.
         """
-        self.body: typing.Union[typing.List[TryExcept], typing.List[NodeNG]] = []
+        self.body: typing.List[Union[NodeNG, TryExcept]] = []
         """The try-except that the finally is attached to."""
 
         self.finalbody: typing.List[NodeNG] = []
@@ -4116,7 +4117,7 @@ def __init__(
 
     def postinit(
         self,
-        body: typing.Union[typing.List[TryExcept], typing.List[NodeNG], None] = None,
+        body: Optional[typing.List[Union[NodeNG, TryExcept]]] = None,
         finalbody: Optional[typing.List[NodeNG]] = None,
     ) -> None:
         """Do some setup after initialisation.
@@ -4899,12 +4900,12 @@ class EvaluatedObject(NodeNG):
     _other_fields = ("value",)
 
     def __init__(
-        self, original: NodeNG, value: typing.Union[NodeNG, util.Uninferable]
+        self, original: NodeNG, value: Union[NodeNG, Type[util.Uninferable]]
     ) -> None:
         self.original: NodeNG = original
         """The original node that has already been evaluated"""
 
-        self.value: typing.Union[NodeNG, util.Uninferable] = value
+        self.value: Union[NodeNG, Type[util.Uninferable]] = value
         """The inferred value"""
 
         super().__init__(
@@ -5182,7 +5183,7 @@ def postinit(
                 "MatchMapping",
                 AssignName,
                 Optional[InferenceContext],
-                Literal[None],
+                None,
             ],
             Generator[NodeNG, None, None],
         ]
@@ -5289,7 +5290,7 @@ def postinit(self, *, name: Optional[AssignName]) -> None:
                 "MatchStar",
                 AssignName,
                 Optional[InferenceContext],
-                Literal[None],
+                None,
             ],
             Generator[NodeNG, None, None],
         ]
@@ -5360,7 +5361,7 @@ def postinit(
                 "MatchAs",
                 AssignName,
                 Optional[InferenceContext],
-                Literal[None],
+                None,
             ],
             Generator[NodeNG, None, None],
         ]

astroid/nodes/node_ng.py

@@ -289,7 +289,7 @@ def parent_of(self, node):
 
     @overload
     def statement(
-        self, *, future: Literal[None] = ...
+        self, *, future: None = ...
     ) -> Union["nodes.Statement", "nodes.Module"]:
         ...
 

astroid/nodes/scoped_nodes/scoped_nodes.py

@@ -442,7 +442,7 @@ def __init__(
         file: Optional[str] = None,
         path: Optional[List[str]] = None,
         package: Optional[bool] = None,
-        parent: Literal[None] = None,
+        parent: None = None,
         pure_python: Optional[bool] = True,
     ) -> None:
         """
@@ -633,7 +633,7 @@ def fully_defined(self):
         return self.file is not None and self.file.endswith(".py")
 
     @overload
-    def statement(self, *, future: Literal[None] = ...) -> "Module":
+    def statement(self, *, future: None = ...) -> "Module":
         ...
 
     @overload

astroid/protocols.py

@@ -35,7 +35,6 @@
 import collections
 import itertools
 import operator as operator_mod
-import sys
 from typing import Any, Generator, List, Optional, Union
 
 from astroid import arguments, bases, decorators, helpers, nodes, util
@@ -50,11 +49,6 @@
 )
 from astroid.nodes import node_classes
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
-
 raw_building = util.lazy_import("raw_building")
 objects = util.lazy_import("objects")
 
@@ -873,7 +867,7 @@ def match_mapping_assigned_stmts(
     self: nodes.MatchMapping,
     node: nodes.AssignName,
     context: Optional[InferenceContext] = None,
-    assign_path: Literal[None] = None,
+    assign_path: None = None,
 ) -> Generator[nodes.NodeNG, None, None]:
     """Return empty generator (return -> raises StopIteration) so inferred value
     is Uninferable.
@@ -890,7 +884,7 @@ def match_star_assigned_stmts(
     self: nodes.MatchStar,
     node: nodes.AssignName,
     context: Optional[InferenceContext] = None,
-    assign_path: Literal[None] = None,
+    assign_path: None = None,
 ) -> Generator[nodes.NodeNG, None, None]:
     """Return empty generator (return -> raises StopIteration) so inferred value
     is Uninferable.
@@ -907,7 +901,7 @@ def match_as_assigned_stmts(
     self: nodes.MatchAs,
     node: nodes.AssignName,
     context: Optional[InferenceContext] = None,
-    assign_path: Literal[None] = None,
+    assign_path: None = None,
 ) -> Generator[nodes.NodeNG, None, None]:
     """Infer MatchAs as the Match subject if it's the only MatchCase pattern
     else raise StopIteration to yield Uninferable.

astroid/rebuilder.py

@@ -2317,7 +2317,7 @@ def visit_try(
                 )
             else:
                 newnode = nodes.TryFinally(node.lineno, node.col_offset, parent)
-            body: Union[List[nodes.TryExcept], List[NodeNG]]
+            body: List[Union[NodeNG, nodes.TryExcept]]
             if node.handlers:
                 body = [self.visit_tryexcept(node, newnode)]
             else: