Skip to content

Synchronise master with upstream #525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 1 commit into from
Feb 16, 2026
Merged

Synchronise master with upstream #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions kayobe/ansible.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,7 @@
import sys
import tempfile

# TODO(dougszu): Backwards compatibility for Ansible 11. This exception
# handler can be removed in the G cycle.
try:
from ansible.parsing.vault import EncryptedString
except ImportError:
# Ansible 11
from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
EncryptedString = AnsibleVaultEncryptedUnicode
from ansible.parsing.vault import EncryptedString

from kayobe import exception
from kayobe import utils
Expand Down
10 changes: 1 addition & 9 deletions kayobe/tests/unit/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,7 @@
import unittest
from unittest import mock

# TODO(dougszu): Backwards compatibility for Ansible 11. This exception
# handler can be removed in the G cycle.
try:
from ansible.parsing.vault import EncryptedString
except ImportError:
# Ansible 11
from ansible.parsing.yaml.objects import AnsibleVaultEncryptedUnicode
EncryptedString = AnsibleVaultEncryptedUnicode

from ansible.parsing.vault import EncryptedString
import yaml

from kayobe import exception
Expand Down