diff options
| author | Matt Clay <matt@mystile.com> | 2023-04-11 13:32:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-11 13:32:08 -0700 |
| commit | f79985958e78551c32f5f1f3d61c10244a8d8f80 (patch) | |
| tree | e780198c2691a66a789cf98c3af29afcee2fce0e | |
| parent | 5b70f5cdbd2fbc6dfe3c50fb577b3adec31a74c0 (diff) | |
| download | ansible-f79985958e78551c32f5f1f3d61c10244a8d8f80.tar.gz | |
[stable-2.12] ansible-test - Add support for argcomplete 3 (#80482). (#80487)
(cherry picked from commit 0371ea08d6de55635ffcbf94da5ddec0cd809495)
| -rw-r--r-- | changelogs/fragments/ansible-test-argcomplete-3.yml | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/cli/argparsing/argcompletion.py | 25 |
2 files changed, 22 insertions, 5 deletions
diff --git a/changelogs/fragments/ansible-test-argcomplete-3.yml b/changelogs/fragments/ansible-test-argcomplete-3.yml new file mode 100644 index 0000000000..0c0b01b5d0 --- /dev/null +++ b/changelogs/fragments/ansible-test-argcomplete-3.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible-test - Add support for ``argcomplete`` version 3. diff --git a/test/lib/ansible_test/_internal/cli/argparsing/argcompletion.py b/test/lib/ansible_test/_internal/cli/argparsing/argcompletion.py index ca502c530a..44fb204a5a 100644 --- a/test/lib/ansible_test/_internal/cli/argparsing/argcompletion.py +++ b/test/lib/ansible_test/_internal/cli/argparsing/argcompletion.py @@ -16,10 +16,19 @@ class Substitute: try: import argcomplete - from argcomplete import ( - CompletionFinder, - default_validator, - ) + try: + # argcomplete 3+ + # see: https://github.com/kislyuk/argcomplete/commit/bd781cb08512b94966312377186ebc5550f46ae0 + from argcomplete.finders import ( + CompletionFinder, + default_validator, + ) + except ImportError: + # argcomplete <3 + from argcomplete import ( + CompletionFinder, + default_validator, + ) warn = argcomplete.warn # pylint: disable=invalid-name except ImportError: @@ -70,7 +79,13 @@ class CompType(enum.Enum): def register_safe_action(action_type): # type: (t.Type[argparse.Action]) -> None """Register the given action as a safe action for argcomplete to use during completion if it is not already registered.""" if argcomplete and action_type not in argcomplete.safe_actions: - argcomplete.safe_actions += (action_type,) + if isinstance(argcomplete.safe_actions, set): + # argcomplete 3+ + # see: https://github.com/kislyuk/argcomplete/commit/bd781cb08512b94966312377186ebc5550f46ae0 + argcomplete.safe_actions.add(action_type) + else: + # argcomplete <3 + argcomplete.safe_actions += (action_type,) def get_comp_type(): # type: () -> t.Optional[CompType] |