tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 15:44:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #166 from orchardup/utf8-fixes

Browse Source 
Fix UnicodeEncodeErrors in output of 'build', 'run' and 'up'
This commit is contained in:
Aanand Prasad 2014-03-25 13:43:50 +00:00
commit 401ea4e7a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fig/cli/log_printer.py
View File

@ -18,7 +18,7 @@ class LogPrinter(object):
def run(self): def run(self):
mux = Multiplexer(self.generators) mux = Multiplexer(self.generators)
for line in mux.loop(): for line in mux.loop():
sys.stdout.write(line) sys.stdout.write(line.encode(sys.__stdout__.encoding or 'utf8'))
def _make_log_generators(self): def _make_log_generators(self):
color_fns = cycle(colors.rainbow()) color_fns = cycle(colors.rainbow())

2
fig/cli/socketclient.py
View File

@ -81,7 +81,7 @@ class SocketClient:
chunk = socket.recv(4096) chunk = socket.recv(4096)
if chunk: if chunk:
stream.write(chunk) stream.write(chunk.encode(stream.encoding or 'utf8'))
stream.flush() stream.flush()
else: else:
break break

2
fig/service.py
View File

@ -295,7 +295,7 @@ class Service(object):
match = re.search(r'Successfully built ([0-9a-f]+)', line) match = re.search(r'Successfully built ([0-9a-f]+)', line)
if match: if match:
image_id = match.group(1) image_id = match.group(1)
sys.stdout.write(line) sys.stdout.write(line.encode(sys.__stdout__.encoding or 'utf8'))
if image_id is None: if image_id is None:
raise BuildError() raise BuildError()