Revert "Update the paramiko runner code to replace all occurances of …

…\r\n in the"

This reverts commit 21fac2c.

st2common/st2common/runners/paramiko_ssh.py

@@ -363,13 +363,7 @@ def run(self, cmd, timeout=None, quote=False, call_line_handler_func=False):
         if cmd.startswith('sudo'):
             # Note that fabric does this as well. If you set pty, stdout and stderr
             # streams will be combined into one.
-            # NOTE: If pty is used, every new line character \n will be converted to \r\n which
-            # isn't desired. Because of that we sanitize the output and replace \r\n with \n at the
-            # bottom of this method
-            uses_pty = True
             chan.get_pty()
-        else:
-            uses_pty = False
         chan.exec_command(cmd)
 
         stdout = StringIO()
@@ -410,8 +404,8 @@ def run(self, cmd, timeout=None, quote=False, call_line_handler_func=False):
                 # TODO: Is this the right way to clean up?
                 chan.close()
 
-                stdout = self._sanitize_output(stdout.getvalue(), uses_pty=uses_pty)
-                stderr = self._sanitize_output(stderr.getvalue(), uses_pty=uses_pty)
+                stdout = strip_shell_chars(stdout.getvalue())
+                stderr = strip_shell_chars(stderr.getvalue())
                 raise SSHCommandTimeoutError(cmd=cmd, timeout=timeout, stdout=stdout,
                                              stderr=stderr)
 
@@ -440,8 +434,8 @@ def run(self, cmd, timeout=None, quote=False, call_line_handler_func=False):
         # Receive the exit status code of the command we ran.
         status = chan.recv_exit_status()
 
-        stdout = self._sanitize_output(stdout.getvalue(), uses_pty=uses_pty)
-        stderr = self._sanitize_output(stderr.getvalue(), uses_pty=uses_pty)
+        stdout = strip_shell_chars(stdout.getvalue())
+        stderr = strip_shell_chars(stderr.getvalue())
 
         extra = {'_status': status, '_stdout': stdout, '_stderr': stderr}
         self.logger.debug('Command finished', extra=extra)
@@ -742,20 +736,6 @@ def _get_ssh_config_for_host(self, host):
 
         return ssh_config_info
 
-    def _sanitize_output(self, output, uses_pty=False):
-        """
-        Function which sanitizes the output (stdout / stderr).
-
-        It strips trailing carriage return and new line characters and if pty is used, it also
-        replaces all occurances of \r\n with \n.
-        """
-        output = strip_shell_chars(output)
-
-        if uses_pty:
-            output = output.replace('\r\n', '\n')
-
-        return output
-
     @staticmethod
     def _is_key_file_needs_passphrase(file):
         for cls in [paramiko.RSAKey, paramiko.DSSKey, paramiko.ECDSAKey]: