♻️ Refactor compat logic, remove support for Click 7

fastapi · Mar 24, 2024 · b8130e2 · b8130e2
1 parent 6619036
commit b8130e2
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 301 deletions.
diff --git a/typer/_compat_utils.py b/typer/_compat_utils.py
diff --git a/typer/_completion_click8.py → typer/_completion_classes.py b/typer/_completion_click8.py → typer/_completion_classes.py
diff --git a/typer/_completion_click7.py b/typer/_completion_click7.py
diff --git a/typer/_completion_shared.py b/typer/_completion_shared.py
@@ -14,9 +14,6 @@
     shellingham = None
 
 
-from typing import Optional
-
-
 class Shells(str, Enum):
     bash = "bash"
     zsh = "zsh"

diff --git a/typer/completion.py b/typer/completion.py
@@ -4,7 +4,7 @@
 
 import click
 
-from ._compat_utils import _get_click_major
+from ._completion_classes import completion_init
 from ._completion_shared import Shells, get_completion_script, install
 from .models import ParamMeta
 from .params import Option
@@ -102,17 +102,6 @@ def _install_completion_no_auto_placeholder_function(
     pass  # pragma no cover
 
 
-def completion_init() -> None:
-    if _get_click_major() < 8:
-        from ._completion_click7 import completion_init
-
-        completion_init()
-    else:
-        from ._completion_click8 import completion_init
-
-        completion_init()
-
-
 # Re-implement Click's shell_complete to add error message with:
 # Invalid completion instruction
 # To use 7.x instruction style for compatibility