Merge pull request #50231 from saltstack/revert-50174-bp-50146

Revert "Back-port #50146 to 2018.3"
saltstack · Oct 25, 2018 · 1c8cdf9 · 1c8cdf9
2 parents 8dd4f43 + c76ac1b
commit 1c8cdf9
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/salt/utils/vt.py b/salt/utils/vt.py
@@ -53,7 +53,6 @@
 
 # Import salt libs
 import salt.utils.crypt
-import salt.utils.data
 import salt.utils.stringutils
 from salt.ext.six import string_types
 from salt.log.setup import LOG_LEVELS
@@ -686,7 +685,7 @@ def _recv(self, maxsize):
                         stdout = None
                     else:
                         if self.stream_stdout:
-                            self.stream_stdout.write(salt.utils.data.encode(stdout))
+                            self.stream_stdout.write(stdout)
                             self.stream_stdout.flush()
 
                         if self.stdout_logger:
@@ -704,7 +703,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: