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

Merge pull request #49356 from dwoz/cmdmod

Browse Source 
Fix tests that use timed_subprocess for py3
This commit is contained in:
Daniel Wallace 2018-08-28 08:30:07 -05:00 committed by GitHub
commit 1faf6a7ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/utils/timed_subprocess.py
View File

@ -40,7 +40,7 @@ class TimedProc(object):
if self.timeout and not isinstance(self.timeout, (int, float)):
raise salt.exceptions.TimedProcTimeoutError('Error: timeout {0} must be a number'.format(self.timeout))
if kwargs.get('shell', False):
if six.PY2 and kwargs.get('shell', False):
args = salt.utils.stringutils.to_bytes(args)
try: