diff options
| author | Joffrey F <joffrey@docker.com> | 2018-04-06 17:46:23 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-04-09 11:46:33 -0700 |
| commit | 8356576a9a090462a5469c3ca34b47ca0fafb36e (patch) | |
| tree | 8ec22de05e611750c1d103cc9dbb587c992985c1 /compose/parallel.py | |
| parent | 2975f06ca2301f2b1d392c4dcfb43ddbc1baff39 (diff) | |
Make sure error messages are unicode strings before combining
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'compose/parallel.py')
| -rw-r--r-- | compose/parallel.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/compose/parallel.py b/compose/parallel.py index 5d4791f9..a2eb160e 100644 --- a/compose/parallel.py +++ b/compose/parallel.py @@ -279,9 +279,7 @@ class ParallelStreamWriter(object): def write_initial(self, msg, obj_index): if msg is None: return - self.stream.write("{:<{width}} ... \r\n".format( - msg + ' ' + obj_index, width=self.width)) - self.stream.flush() + return self._write_noansi(msg, obj_index, '') def _write_ansi(self, msg, obj_index, status): self.lock.acquire() @@ -299,8 +297,11 @@ class ParallelStreamWriter(object): self.lock.release() def _write_noansi(self, msg, obj_index, status): - self.stream.write("{:<{width}} ... {}\r\n".format(msg + ' ' + obj_index, - status, width=self.width)) + self.stream.write( + "{:<{width}} ... {}\r\n".format( + msg + ' ' + obj_index, status, width=self.width + ) + ) self.stream.flush() def write(self, msg, obj_index, status, color_func): |