saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Get rid og this json support idea, what folly!

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-04 16:42:14 -07:00
parent c1c144db07
commit 03cec87e9a
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/payload.py
View file

@ -4,7 +4,6 @@ encrypted keys to general payload dynamics and packaging, these happen in here
'''
import os
import cPickle as pickle
import json
def package(payload, form='pickle', protocol=2):
'''
@ -13,29 +12,13 @@ def package(payload, form='pickle', protocol=2):
flexibility and compression, of json, for more compatability. The default
is pickle
'''
package = ''
if form == 'json':
package = json.dumps(payload)
else:
package = pickle.dumps(payload, protocol)
return package
return pickle.dumps(payload, protocol)
def unpackage(package):
'''
Unpackages a payload
'''
# yes, this is dirty for json support, I know it needs some love
payload = None
try:
payload = pickle.loads(package)
except:
pass
if not payload:
try:
payload = json.loads(package)
except ValueError:
pass
return payload
return = pickle.loads(package)
def aes(payload, key):
'''