Intermediate changes

commit_hash:f57d2c87e0eaaab821faa70c3864ec0e7320355d

5 files changed, 6 insertions, 14 deletions

diff --git a/contrib/python/argcomplete/py3/.dist-info/METADATA b/contrib/python/argcomplete/py3/.dist-info/METADATA
index 8eff29ade2e..c8d45d5d152 100644
--- a/contrib/python/argcomplete/py3/.dist-info/METADATA
+++ b/contrib/python/argcomplete/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argcomplete
-Version: 3.6.1
+Version: 3.6.2
 Summary: Bash tab completion for argparse
 Project-URL: Homepage, https://github.com/kislyuk/argcomplete
 Project-URL: Documentation, https://kislyuk.github.io/argcomplete
diff --git a/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete b/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete
index 8a91272dea4..81c9d41f803 100644
--- a/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete
+++ b/contrib/python/argcomplete/py3/argcomplete/bash_completion.d/_python-argcomplete
@@ -124,12 +124,6 @@ __python_argcomplete_which() {
 _python_argcomplete_global() {
 
     if [[ -n "${ZSH_VERSION-}" ]]; then
-        if [[ "${_matcher_num-}" -gt 1 ]]; then
-            # Return early if the completer is called multiple times in the same completion run.
-            # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared.
-            # When this happens, _matcher_num is incremented past 1.
-            return
-        fi
         # Store result of a regex match in the
         # BASH_REMATCH variable rather than MATCH
         setopt local_options BASH_REMATCH
diff --git a/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py b/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py
index 299d081c0ea..8e7d27de6cd 100644
--- a/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py
+++ b/contrib/python/argcomplete/py3/argcomplete/scripts/activate_global_python_argcomplete.py
@@ -121,10 +121,12 @@ def append_to_config_file(path, shellcode):
         fh.write(shellcode)
     print("Added.", file=sys.stderr)
 
+
 def link_zsh_user_rcfile(zsh_fpath=None):
     zsh_rcfile = os.path.join(os.path.expanduser(os.environ.get("ZDOTDIR", "~")), ".zshenv")
     append_to_config_file(zsh_rcfile, zsh_shellcode.format(zsh_fpath=zsh_fpath or get_activator_dir()))
 
+
 def link_bash_user_rcfile():
     bash_completion_user_file = os.path.expanduser("~/.bash_completion")
     append_to_config_file(bash_completion_user_file, bash_shellcode.format(activator=get_activator_path()))
@@ -135,6 +137,7 @@ def link_user_rcfiles():
     link_zsh_user_rcfile()
     link_bash_user_rcfile()
 
+
 def add_zsh_system_dir_to_fpath_for_user():
     if "zsh" not in os.environ.get("SHELL", ""):
         return
@@ -148,6 +151,7 @@ def add_zsh_system_dir_to_fpath_for_user():
     except (FileNotFoundError, subprocess.CalledProcessError):
         pass
 
+
 def main():
     global args
     args = parser.parse_args()
diff --git a/contrib/python/argcomplete/py3/argcomplete/shell_integration.py b/contrib/python/argcomplete/py3/argcomplete/shell_integration.py
index cac48902fa7..3d592dc0ab8 100644
--- a/contrib/python/argcomplete/py3/argcomplete/shell_integration.py
+++ b/contrib/python/argcomplete/py3/argcomplete/shell_integration.py
@@ -34,12 +34,6 @@ _python_argcomplete%(function_suffix)s() {
     local IFS=$'\013'
     local script="%(argcomplete_script)s"
     if [[ -n "${ZSH_VERSION-}" ]]; then
-        if [[ "${_matcher_num-}" -gt 1 ]]; then
-            # Return early if the completer is called multiple times in the same completion run.
-            # Currently the only known occurrence of this is in zsh when a matcher-list zstyle is declared.
-            # When this happens, _matcher_num is incremented past 1.
-            return
-        fi
         local completions
         completions=($(IFS="$IFS" \
             COMP_LINE="$BUFFER" \
diff --git a/contrib/python/argcomplete/py3/ya.make b/contrib/python/argcomplete/py3/ya.make
index 327bc4e34ed..6d1fd084471 100644
--- a/contrib/python/argcomplete/py3/ya.make
+++ b/contrib/python/argcomplete/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(3.6.1)
+VERSION(3.6.2)
 
 LICENSE(Apache-2.0)