valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move from basestring to six.string_types which is compatible with python 2 and 3

Browse Source
This commit is contained in:
nfraison 2015-07-01 23:14:28 +02:00
parent 7c3f6cf2a7
commit 7ddfb87a1c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/renderers/gpg.py
View File

@ -95,6 +95,7 @@ from salt.exceptions import SaltRenderError
# Import 3rd-party libs
import salt.ext.six as six
# pylint: disable=import-error
try:
import gnupg
@ -135,11 +136,11 @@ def decrypt_ciphertext(cypher, gpg, safe=False):
def decrypt_object(obj, gpg):
'''
Recursively try to decrypt any object. If the object is a basestring (string or unicode), and
Recursively try to decrypt any object. If the object is a six.string_types (string or unicode), and
it contains a valid GPG header, decrypt it, otherwise keep going until
a string is found.
'''
if isinstance(obj, basestring):
if isinstance(obj, six.string_types):
if GPG_HEADER.search(obj):
return decrypt_ciphertext(obj, gpg)
else: