Merge pull request #8641 from rahul-kumi/fix/8548
add support for precision bit in LEVEL_NAME_FMT regex
This commit is contained in:
commit
3ae0103975
|
@ -0,0 +1 @@
|
|||
Introduce fix to handle precision width in ``log-cli-format`` in turn to fix output coloring for certain formats.
|
|
@ -59,7 +59,7 @@ class ColoredLevelFormatter(logging.Formatter):
|
|||
logging.DEBUG: {"purple"},
|
||||
logging.NOTSET: set(),
|
||||
}
|
||||
LEVELNAME_FMT_REGEX = re.compile(r"%\(levelname\)([+-.]?\d*s)")
|
||||
LEVELNAME_FMT_REGEX = re.compile(r"%\(levelname\)([+-.]?\d*(?:\.\d+)?s)")
|
||||
|
||||
def __init__(self, terminalwriter: TerminalWriter, *args, **kwargs) -> None:
|
||||
super().__init__(*args, **kwargs)
|
||||
|
|
|
@ -18,9 +18,32 @@ def test_coloredlogformatter() -> None:
|
|||
exc_info=None,
|
||||
)
|
||||
|
||||
class ColorConfig:
|
||||
class option:
|
||||
pass
|
||||
tw = TerminalWriter()
|
||||
tw.hasmarkup = True
|
||||
formatter = ColoredLevelFormatter(tw, logfmt)
|
||||
output = formatter.format(record)
|
||||
assert output == (
|
||||
"dummypath 10 \x1b[32mINFO \x1b[0m Test Message"
|
||||
)
|
||||
|
||||
tw.hasmarkup = False
|
||||
formatter = ColoredLevelFormatter(tw, logfmt)
|
||||
output = formatter.format(record)
|
||||
assert output == ("dummypath 10 INFO Test Message")
|
||||
|
||||
|
||||
def test_coloredlogformatter_with_width_precision() -> None:
|
||||
logfmt = "%(filename)-25s %(lineno)4d %(levelname)-8.8s %(message)s"
|
||||
|
||||
record = logging.LogRecord(
|
||||
name="dummy",
|
||||
level=logging.INFO,
|
||||
pathname="dummypath",
|
||||
lineno=10,
|
||||
msg="Test Message",
|
||||
args=(),
|
||||
exc_info=None,
|
||||
)
|
||||
|
||||
tw = TerminalWriter()
|
||||
tw.hasmarkup = True
|
||||
|
|
Loading…
Reference in New Issue