From d86782bff5faf383c0b6e23ee2980748556c1ccc Mon Sep 17 00:00:00 2001 From: rallytime Date: Thu, 25 Oct 2018 17:01:45 -0400 Subject: [PATCH] Don't encode the return values in utils/vt.py These encodings were causing the salt-ssh tests to fail. This is a partial revert of #50146. In order to see if the tests succeed, PR #50230 will need to be merged first. --- salt/utils/vt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/utils/vt.py b/salt/utils/vt.py index dbc947b842b3..89687578af93 100644 --- a/salt/utils/vt.py +++ b/salt/utils/vt.py @@ -704,7 +704,7 @@ def _recv(self, maxsize): if self.child_fd is not None: fcntl.fcntl(self.child_fd, fcntl.F_SETFL, fd_flags) # <---- Process STDOUT ------------------------------------------- - return salt.utils.data.encode(stdout), salt.utils.data.encode(stderr) + return stdout, stderr def __detect_parent_terminal_size(self): try: