Merge pull request #48997 from AVeenstra/patch-1

Python 3 related fix in highstate_return.py
This commit is contained in:
Nicole Thomas 2018-08-09 13:57:51 -04:00 committed by GitHub
commit c5f3fd6b2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -86,6 +86,7 @@ import cgi
from email.mime.text import MIMEText
import yaml
from salt.ext import six
from salt.ext.six.moves import range
from salt.ext.six.moves import StringIO
@ -185,8 +186,7 @@ def _generate_html_table(data, out, level=0, extra_style=''):
else:
new_extra_style = extra_style
if len(subdata) == 1:
name = subdata.keys()[0]
value = subdata.values()[0]
name, value = next(six.iteritems(subdata))
print('<tr style="{0}">'.format(
_lookup_style('tr', [row_style])
), file=out)