diff options
| author | Michael Scherer <mscherer@users.noreply.github.com> | 2018-01-23 19:02:09 +0100 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2018-01-23 12:02:09 -0600 |
| commit | 060001b08d98969217156b2b696613ade44eb8c5 (patch) | |
| tree | 2b8d6a38403d739386eac5b04c4d588e1e9ca080 /lib/ansible/parsing | |
| parent | ec80f8ad80f7c4b7a0199b10b7db34f8b9af9d49 (diff) | |
| download | ansible-060001b08d98969217156b2b696613ade44eb8c5.tar.gz | |
Remove deprecated code (#34828)
* Remove compat code for to_unicode, to_str and to_bytes
Code was marked as deprecated and to be removed after 2.4
* Remove is_encrypted and is_encrypted_file
Code was marked as deprecated after 2.4 release.
Diffstat (limited to 'lib/ansible/parsing')
| -rw-r--r-- | lib/ansible/parsing/vault/__init__.py | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/ansible/parsing/vault/__init__.py b/lib/ansible/parsing/vault/__init__.py index c9a54ae3e7..cca3164763 100644 --- a/lib/ansible/parsing/vault/__init__.py +++ b/lib/ansible/parsing/vault/__init__.py @@ -600,26 +600,6 @@ class VaultLib: self.cipher_name = None self.b_version = b'1.2' - @staticmethod - def is_encrypted(data): - """ Test if this is vault encrypted data - - :arg data: a byte or text string or a python3 to test for whether it is - recognized as vault encrypted data - :returns: True if it is recognized. Otherwise, False. - """ - - # This could in the future, check to see if the data is a vault blob and - # is encrypted with a key associated with this vault - # instead of just checking the format. - display.deprecated(u'vault.VaultLib.is_encrypted is deprecated. Use vault.is_encrypted instead', version='2.4') - return is_encrypted(data) - - @staticmethod - def is_encrypted_file(file_obj): - display.deprecated(u'vault.VaultLib.is_encrypted_file is deprecated. Use vault.is_encrypted_file instead', version='2.4') - return is_encrypted_file(file_obj) - def encrypt(self, plaintext, secret=None, vault_id=None): """Vault encrypt a piece of data. |