saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23372 from s0undt3ch/develop

Browse source 
Py3 fix
This commit is contained in:
Nicole Thomas 2015-05-05 09:48:49 -06:00
commit c6987866a2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/runners/doc.py
View file

@ -4,7 +4,7 @@ A runner module to collect and display the inline documentation from the
various module types
'''
# Import Python libs
from __future__ import absolute_import
from __future__ import absolute_import, print_function
import itertools
# Import salt libs
@ -72,7 +72,7 @@ def execution():
for v in six.itervalues(ret):
docs.update(v)
except SaltClientError as exc:
print exc # pylint: disable=W1698
print(exc) # pylint: disable=W1698
return []
i = itertools.chain.from_iterable([six.iteritems(i) for i in six.itervalues(docs)])