✨ Avoid the unnecessary import of typing_extensions in newer Python versions (#1048)

Co-authored-by: Sofie Van Landeghem <svlandeg@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: svlandeg <svlandeg@github.com>

Author: 3 people

typer/_typing.py

@@ -13,7 +13,16 @@
     Union,
 )
 
-from typing_extensions import Literal, get_args, get_origin
+if sys.version_info >= (3, 9):
+    from typing import Annotated, Literal, get_args, get_origin, get_type_hints
+else:
+    from typing_extensions import (
+        Annotated,
+        Literal,
+        get_args,
+        get_origin,
+        get_type_hints,
+    )
 
 if sys.version_info < (3, 10):
 
@@ -34,6 +43,11 @@ def is_union(tp: Optional[Type[Any]]) -> bool:
     "is_literal_type",
     "all_literal_values",
     "is_union",
+    "Annotated",
+    "Literal",
+    "get_args",
+    "get_origin",
+    "get_type_hints",
 )
 
 

typer/core.py

@@ -26,10 +26,7 @@
 import click.types
 import click.utils
 
-if sys.version_info >= (3, 8):
-    from typing import Literal
-else:
-    from typing_extensions import Literal
+from ._typing import Literal
 
 MarkupMode = Literal["markdown", "rich", None]
 

typer/main.py

@@ -15,9 +15,8 @@
 from uuid import UUID
 
 import click
-from typing_extensions import get_args, get_origin
 
-from ._typing import is_union
+from ._typing import get_args, get_origin, is_union
 from .completion import get_completion_inspect_parameters
 from .core import (
     DEFAULT_MARKUP_MODE,

typer/rich_utils.py

@@ -22,7 +22,7 @@
 from rich.text import Text
 from rich.theme import Theme
 
-if sys.version_info >= (3, 8):
+if sys.version_info >= (3, 9):
     from typing import Literal
 else:
     from typing_extensions import Literal

typer/utils.py

@@ -3,8 +3,7 @@
 from copy import copy
 from typing import Any, Callable, Dict, List, Tuple, Type, cast
 
-from typing_extensions import Annotated, get_args, get_origin, get_type_hints
-
+from ._typing import Annotated, get_args, get_origin, get_type_hints
 from .models import ArgumentInfo, OptionInfo, ParameterInfo, ParamMeta