jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4016 from shin-/4008-unicode-formatter

Browse source 
Handle formatter case where logrecord message is binary containing unicode
This commit is contained in:
Joffrey F 2016-10-06 16:49:03 -07:00 • committed by GitHub
commit 9248298a4a
2 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compose/cli/formatter.py
View file

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import logging
import os
import six
import texttable
from compose.cli import colors
@ -44,5 +45,7 @@ class ConsoleWarningFormatter(logging.Formatter):
return ''
def format(self, record):
if isinstance(record.msg, six.binary_type):
record.msg = record.msg.decode('utf-8')
message = super(ConsoleWarningFormatter, self).format(record)
return self.get_level_message(record) + message
return '{0}{1}'.format(self.get_level_message(record), message)