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

Use six.moves.StringIO

Browse Source
This commit is contained in:
Pedro Algarvio 2017-02-12 12:38:08 +00:00
parent 005f21d3b5
commit 8e5a31f0d1
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/returners/highstate_return.py
View File

@ -81,13 +81,13 @@ from __future__ import absolute_import, print_function
import logging import logging
import json import json
import StringIO
import smtplib import smtplib
import cgi import cgi
from email.mime.text import MIMEText from email.mime.text import MIMEText
import yaml import yaml
from salt.ext.six.moves import range from salt.ext.six.moves import range
from salt.ext.six.moves import StringIO
import salt.returners import salt.returners
@ -423,12 +423,12 @@ def _produce_output(report, failed, setup):
if report_format == 'json': if report_format == 'json':
report_text = json.dumps(report) report_text = json.dumps(report)
elif report_format == 'yaml': elif report_format == 'yaml':
string_file = StringIO.StringIO() string_file = StringIO()
yaml.safe_dump(report, string_file, default_flow_style=False) yaml.safe_dump(report, string_file, default_flow_style=False)
string_file.seek(0) string_file.seek(0)
report_text = string_file.read() report_text = string_file.read()
else: else:
string_file = StringIO.StringIO() string_file = StringIO()
_generate_html(report, string_file) _generate_html(report, string_file)
string_file.seek(0) string_file.seek(0)
report_text = string_file.read() report_text = string_file.read()
@ -493,7 +493,7 @@ def __test_html():
data_text = input_file.read() data_text = input_file.read()
data = yaml.safe_load(data_text) data = yaml.safe_load(data_text)
string_file = StringIO.StringIO() string_file = StringIO()
_generate_html(data, string_file) _generate_html(data, string_file)
string_file.seek(0) string_file.seek(0)
result = string_file.read() result = string_file.read()