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

Py3 compatibility fixes

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-22 10:30:29 +00:00
parent bf411c3fae
commit 21b15c9510
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/client/ssh/wrapper/__init__.py
View File

@ -5,9 +5,9 @@ how executions are run in the salt-ssh system, this allows for state routines
to be easily rewritten to execute in a way that makes them do the same tasks
as ZeroMQ salt, but via ssh.
'''
from __future__ import absolute_import
# Import python libs
from __future__ import absolute_import
import json
import copy
@ -16,6 +16,9 @@ import salt.loader
import salt.utils
import salt.client.ssh
# Import 3rd-party libs
import salt.ext.six as six
class FunctionWrapper(object):
'''
@ -78,7 +81,7 @@ class FunctionWrapper(object):
'''
argv = [cmd]
argv.extend([str(arg) for arg in args])
argv.extend(['{0}={1}'.format(key, val) for key, val in kwargs.items()])
argv.extend(['{0}={1}'.format(key, val) for key, val in six.iteritems(kwargs)])
single = salt.client.ssh.Single(
self.opts,
argv,