mirror of https://github.com/django/django.git
Fixed #19663 -- Allowed None in colorize() text parameter
Thanks Jonathan Liuti for the report and the initial patch, and Simon Charette for the review.
This commit is contained in:
parent
0412b7d280
commit
04141c525d
|
@ -52,8 +52,8 @@ def colorize(text='', opts=(), **kwargs):
|
||||||
if o in opt_dict:
|
if o in opt_dict:
|
||||||
code_list.append(opt_dict[o])
|
code_list.append(opt_dict[o])
|
||||||
if 'noreset' not in opts:
|
if 'noreset' not in opts:
|
||||||
text = text + '\x1b[%sm' % RESET
|
text = '%s\x1b[%sm' % (text or '', RESET)
|
||||||
return ('\x1b[%sm' % ';'.join(code_list)) + text
|
return '%s%s' % (('\x1b[%sm' % ';'.join(code_list)), text or '')
|
||||||
|
|
||||||
def make_style(opts=(), **kwargs):
|
def make_style(opts=(), **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
from django.utils import unittest
|
from django.utils import unittest
|
||||||
from django.utils.termcolors import parse_color_setting, PALETTES, DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE
|
from django.utils.termcolors import (parse_color_setting, PALETTES,
|
||||||
|
DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE, colorize)
|
||||||
|
|
||||||
|
|
||||||
class TermColorTests(unittest.TestCase):
|
class TermColorTests(unittest.TestCase):
|
||||||
|
|
||||||
|
@ -146,3 +148,10 @@ class TermColorTests(unittest.TestCase):
|
||||||
self.assertEqual(parse_color_setting('error=green,bLiNk'),
|
self.assertEqual(parse_color_setting('error=green,bLiNk'),
|
||||||
dict(PALETTES[NOCOLOR_PALETTE],
|
dict(PALETTES[NOCOLOR_PALETTE],
|
||||||
ERROR={'fg':'green', 'opts': ('blink',)}))
|
ERROR={'fg':'green', 'opts': ('blink',)}))
|
||||||
|
|
||||||
|
def test_colorize_empty_text(self):
|
||||||
|
self.assertEqual(colorize(text=None), '\x1b[m\x1b[0m')
|
||||||
|
self.assertEqual(colorize(text=''), '\x1b[m\x1b[0m')
|
||||||
|
|
||||||
|
self.assertEqual(colorize(text=None, opts=('noreset')), '\x1b[m')
|
||||||
|
self.assertEqual(colorize(text='', opts=('noreset')), '\x1b[m')
|
||||||
|
|
Loading…
Reference in New Issue