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

msgpack data is binary, open in binary mode

Browse Source
This commit is contained in:
Pedro Algarvio 2015-07-15 20:30:59 +01:00
parent 8fa8d5c5b5
commit ad95c0e8cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/http.py
View File

@ -218,12 +218,12 @@ def query(url,
# proper cookie jar. Unfortunately, since session cookies do not # proper cookie jar. Unfortunately, since session cookies do not
# contain expirations, they can't be stored in a proper cookie jar. # contain expirations, they can't be stored in a proper cookie jar.
if os.path.isfile(session_cookie_jar): if os.path.isfile(session_cookie_jar):
with salt.utils.fopen(session_cookie_jar, 'r') as fh_: with salt.utils.fopen(session_cookie_jar, 'rb') as fh_:
session_cookies = msgpack.load(fh_) session_cookies = msgpack.load(fh_)
if isinstance(session_cookies, dict): if isinstance(session_cookies, dict):
header_dict.update(session_cookies) header_dict.update(session_cookies)
else: else:
with salt.utils.fopen(session_cookie_jar, 'w') as fh_: with salt.utils.fopen(session_cookie_jar, 'wb') as fh_:
msgpack.dump('', fh_) msgpack.dump('', fh_)
for header in header_list: for header in header_list:
@ -462,7 +462,7 @@ def query(url,
if persist_session is True and HAS_MSGPACK: if persist_session is True and HAS_MSGPACK:
# TODO: See persist_session above # TODO: See persist_session above
if 'set-cookie' in result_headers: if 'set-cookie' in result_headers:
with salt.utils.fopen(session_cookie_jar, 'w') as fh_: with salt.utils.fopen(session_cookie_jar, 'wb') as fh_:
session_cookies = result_headers.get('set-cookie', None) session_cookies = result_headers.get('set-cookie', None)
if session_cookies is not None: if session_cookies is not None:
msgpack.dump({'Cookie': session_cookies}, fh_) msgpack.dump({'Cookie': session_cookies}, fh_)