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.
This commit is contained in:
Michael Scherer 2018-01-23 19:02:09 +01:00 committed by Adam Miller
parent ec80f8ad80
commit 060001b08d
3 changed files with 2 additions and 58 deletions

View file

@ -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.