[core] fix field detection for escaped % and { format styles - #75
Open
dylanpulver wants to merge 2 commits into
Open
[core] fix field detection for escaped % and { format styles#75dylanpulver wants to merge 2 commits into
dylanpulver wants to merge 2 commits into
Conversation
`parse()` read `%%(name)s` and `{{name}}` as fields even though both are
escaped literals, and read a `{` style conversion or format spec as part
of the field name, so `{levelname:>8}` produced a `"levelname:>8": null`
key and dropped `levelname`.
`%` now skips `%%` the same way the `$` style skips `$$` (nhairs#69), and `{`
uses `string.Formatter`, which is what `logging.StrFormatStyle.validate`
parses the same string with.
Assisted-by: claude-opus-5
A regex-only fix passes the plain `{levelname:>8}` case but reads
`{width}` out of `{levelname:>{width}}`, which stdlib accepts.
Assisted-by: claude-opus-5
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #74.
parse()reads escaped literals as fields:%%(b)sin a%format,{{b}}in a{one. #69 fixed this for$; these two were left.{also folds a conversion or format spec into the name, so"{levelname:>8} {message}"— an ordinary stdlib format thatStrFormatStyle.validate()accepts — logs{"levelname:>8": null, "message": "hello"}.Changes
%: skip%%, mirroring the$fix.{: usestring.Formatter, which is whatlogging.StrFormatStyle.validateparses the same string with. Covers{{/}},!r,:>8, and nested specs like{levelname:>{width}}.STYLE_STRING_FORMAT_REGEXis kept but unused — say the word and I'll drop it.Testing
pytest tests: 224 passed, 218 before. Two new tests beside the existing per-style ones. black/pylint/mypy/validate-pyproject clean.Oracle: the substitution engine itself (
fmt % tracking_dict,string.Formatter().parse,Template.get_identifiers). Over 37 formats$agreed 7/7 as a control;%+{diverged 13x before, 1 after — the remainder is"{}", whichvalidate()skips too.Reverting only the
core.pychange fails the 6 new cases and nothing else. A regex-only alternative passes{levelname:>8}but readswidthout of{levelname:>{width}}; hence that case in the test.One behaviour change: with
validate=Falsea malformed{format now raises at construction instead of silently yielding no fields.Prepared with AI assistance; I reviewed and tested it locally.