Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Python 3 related fix in highstate_return.py #48997

Merged
merged 2 commits into from
Aug 9, 2018
Merged

Python 3 related fix in highstate_return.py #48997

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e82685
Python 3 related fix in highstate_return.py
AVeenstra Aug 8, 2018
0e535f2
Unpacking dict with the six iterator
AVeenstra Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions salt/returners/highstate_return.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
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

Expand Down Expand Up @@ -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)
Expand Down