Merge pull request #11417 from Freed-Wu/fix-zsh

pypa · Jul 15, 2023 · 324dd44 · 324dd44
2 parents e53cf3d + fb45457
commit 324dd44
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/news/11416.bugfix.rst b/news/11416.bugfix.rst
@@ -0,0 +1 @@
+Fix ``pip completion --zsh``.
diff --git a/src/pip/_internal/commands/completion.py b/src/pip/_internal/commands/completion.py
@@ -22,15 +22,10 @@
         complete -o default -F _pip_completion {prog}
     """,
     "zsh": """
-        function _pip_completion {{
-          local words cword
-          read -Ac words
-          read -cn cword
-          reply=( $( COMP_WORDS="$words[*]" \\
-                     COMP_CWORD=$(( cword-1 )) \\
-                     PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ))
-        }}
-        compctl -K _pip_completion {prog}
+        #compdef -P pip[0-9.]#
+        compadd $( COMP_WORDS="$words[*]" \\
+                   COMP_CWORD=$((CURRENT-1)) \\
+                   PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null )
     """,
     "fish": """
         function __fish_complete_pip

diff --git a/tests/functional/test_completion.py b/tests/functional/test_completion.py
@@ -44,15 +44,10 @@
     (
         "zsh",
         """\
-function _pip_completion {
-  local words cword
-  read -Ac words
-  read -cn cword
-  reply=( $( COMP_WORDS="$words[*]" \\
-             COMP_CWORD=$(( cword-1 )) \\
-             PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null ))
-}
-compctl -K _pip_completion pip""",
+#compdef -P pip[0-9.]#
+compadd $( COMP_WORDS="$words[*]" \\
+           COMP_CWORD=$((CURRENT-1)) \\
+           PIP_AUTO_COMPLETE=1 $words[1] 2>/dev/null )""",
     ),
     (
         "powershell",
@@ -392,7 +387,8 @@ def test_completion_path_after_option(
     )
 
 
-@pytest.mark.parametrize("flag", ["--bash", "--zsh", "--fish", "--powershell"])
+# zsh completion script doesn't contain pip3
+@pytest.mark.parametrize("flag", ["--bash", "--fish", "--powershell"])
 def test_completion_uses_same_executable_name(
     autocomplete_script: PipTestEnvironment, flag: str, deprecated_python: bool
 ) -> None: