mirror of
https://github.com/docker/compose.git
synced 2025-07-23 05:34:36 +02:00
Handle formatter case where logrecord message is binary containing
unicode characters. Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
parent
8f636d8279
commit
17c5b45641
@ -4,6 +4,7 @@ from __future__ import unicode_literals
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
import six
|
||||||
import texttable
|
import texttable
|
||||||
|
|
||||||
from compose.cli import colors
|
from compose.cli import colors
|
||||||
@ -44,5 +45,7 @@ class ConsoleWarningFormatter(logging.Formatter):
|
|||||||
return ''
|
return ''
|
||||||
|
|
||||||
def format(self, record):
|
def format(self, record):
|
||||||
|
if isinstance(record.msg, six.binary_type):
|
||||||
|
record.msg = record.msg.decode('utf-8')
|
||||||
message = super(ConsoleWarningFormatter, self).format(record)
|
message = super(ConsoleWarningFormatter, self).format(record)
|
||||||
return self.get_level_message(record) + message
|
return '{0}{1}'.format(self.get_level_message(record), message)
|
||||||
|
@ -11,8 +11,8 @@ from tests import unittest
|
|||||||
MESSAGE = 'this is the message'
|
MESSAGE = 'this is the message'
|
||||||
|
|
||||||
|
|
||||||
def makeLogRecord(level):
|
def make_log_record(level, message=None):
|
||||||
return logging.LogRecord('name', level, 'pathame', 0, MESSAGE, (), None)
|
return logging.LogRecord('name', level, 'pathame', 0, message or MESSAGE, (), None)
|
||||||
|
|
||||||
|
|
||||||
class ConsoleWarningFormatterTestCase(unittest.TestCase):
|
class ConsoleWarningFormatterTestCase(unittest.TestCase):
|
||||||
@ -21,15 +21,33 @@ class ConsoleWarningFormatterTestCase(unittest.TestCase):
|
|||||||
self.formatter = ConsoleWarningFormatter()
|
self.formatter = ConsoleWarningFormatter()
|
||||||
|
|
||||||
def test_format_warn(self):
|
def test_format_warn(self):
|
||||||
output = self.formatter.format(makeLogRecord(logging.WARN))
|
output = self.formatter.format(make_log_record(logging.WARN))
|
||||||
expected = colors.yellow('WARNING') + ': '
|
expected = colors.yellow('WARNING') + ': '
|
||||||
assert output == expected + MESSAGE
|
assert output == expected + MESSAGE
|
||||||
|
|
||||||
def test_format_error(self):
|
def test_format_error(self):
|
||||||
output = self.formatter.format(makeLogRecord(logging.ERROR))
|
output = self.formatter.format(make_log_record(logging.ERROR))
|
||||||
expected = colors.red('ERROR') + ': '
|
expected = colors.red('ERROR') + ': '
|
||||||
assert output == expected + MESSAGE
|
assert output == expected + MESSAGE
|
||||||
|
|
||||||
def test_format_info(self):
|
def test_format_info(self):
|
||||||
output = self.formatter.format(makeLogRecord(logging.INFO))
|
output = self.formatter.format(make_log_record(logging.INFO))
|
||||||
assert output == MESSAGE
|
assert output == MESSAGE
|
||||||
|
|
||||||
|
def test_format_unicode_info(self):
|
||||||
|
message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
|
||||||
|
output = self.formatter.format(make_log_record(logging.INFO, message))
|
||||||
|
print(output)
|
||||||
|
assert output == message.decode('utf-8')
|
||||||
|
|
||||||
|
def test_format_unicode_warn(self):
|
||||||
|
message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
|
||||||
|
output = self.formatter.format(make_log_record(logging.WARN, message))
|
||||||
|
expected = colors.yellow('WARNING') + ': '
|
||||||
|
assert output == '{0}{1}'.format(expected, message.decode('utf-8'))
|
||||||
|
|
||||||
|
def test_format_unicode_error(self):
|
||||||
|
message = b'\xec\xa0\x95\xec\x88\x98\xec\xa0\x95'
|
||||||
|
output = self.formatter.format(make_log_record(logging.ERROR, message))
|
||||||
|
expected = colors.red('ERROR') + ': '
|
||||||
|
assert output == '{0}{1}'.format(expected, message.decode('utf-8'))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user