diff --git a/kayobe/ansible.py b/kayobe/ansible.py index f6cf8dbb0..caa6df7b1 100644 --- a/kayobe/ansible.py +++ b/kayobe/ansible.py @@ -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 diff --git a/kayobe/tests/unit/test_utils.py b/kayobe/tests/unit/test_utils.py index fc975c221..736678e9f 100644 --- a/kayobe/tests/unit/test_utils.py +++ b/kayobe/tests/unit/test_utils.py @@ -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