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

Update http.py

Browse source 
remove duplicate checks
This commit is contained in:
angeloudy 2018-01-15 13:06:33 +11:00 • committed by GitHub
parent 908c040ac3
commit 269514683f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/utils/http.py
View file

@ -429,8 +429,7 @@ def query(url,
'charset' in res_params and \
not isinstance(result_text, six.text_type):
result_text = result_text.decode(res_params['charset'])
if isinstance(result_text, bytes):
if six.PY3 and isinstance(result_text, bytes):
if six.PY3 and isinstance(result_text, bytes):
result_text = result.body.decode('utf-8')
ret['body'] = result_text
else:
@ -532,8 +531,7 @@ def query(url,
'charset' in res_params and \
not isinstance(result_text, six.text_type):
result_text = result_text.decode(res_params['charset'])
if isinstance(result_text, bytes):
if six.PY3 and isinstance(result_text, bytes):
if six.PY3 and isinstance(result_text, bytes):
result_text = result_text.decode('utf-8')
ret['body'] = result_text
if 'Set-Cookie' in result_headers.keys() and cookies is not None: