From f07e3d9f2dc2b7275e2329f8855140d0aea264b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 11 Feb 2016 09:55:44 +0100 Subject: [PATCH] Fixed output processing for pip processes --- src/octoprint/util/commandline.py | 11 +++++------ src/octoprint/util/pip.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/octoprint/util/commandline.py b/src/octoprint/util/commandline.py index a074d466..606b0e52 100644 --- a/src/octoprint/util/commandline.py +++ b/src/octoprint/util/commandline.py @@ -86,13 +86,13 @@ class CommandlineCaller(object): while p.returncode is None: line = p.stderr.readline(timeout=0.5) if line: - line = self._preprocess_lines(line) + line, = self._preprocess_lines(line) self._log_stderr(line) all_stderr.append(line) line = p.stdout.readline(timeout=0.5) if line: - line = self._preprocess_lines(line) + line, = self._preprocess_lines(line) self._log_stdout(line) all_stdout.append(line) @@ -103,14 +103,13 @@ class CommandlineCaller(object): stderr = p.stderr.text if stderr: - split_lines = self._preprocess_lines( - stderr.split("\n")) + split_lines = self._preprocess_lines(*stderr.split("\n")) self._log_stderr(*split_lines) all_stderr += split_lines stdout = p.stdout.text if stdout: - split_lines = self._preprocess_lines(stdout.split("\n")) + split_lines = self._preprocess_lines(*stdout.split("\n")) self._log_stdout(*split_lines) all_stdout += split_lines @@ -122,5 +121,5 @@ class CommandlineCaller(object): def _log_stderr(self, *lines): self.on_log_stderr(*lines) - def _preprocess_lines(self, lines): + def _preprocess_lines(self, *lines): return lines diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py index 46b667da..f622bcb0 100644 --- a/src/octoprint/util/pip.py +++ b/src/octoprint/util/pip.py @@ -367,7 +367,7 @@ class PipCaller(CommandlineCaller): self._logger.debug("Could not detect desired output from testballoon install, got this instead: {!r}".format(data)) return False, False, False, None - def _preprocess_lines(self, lines): + def _preprocess_lines(self, *lines): return map(self._preprocess, lines) @staticmethod