Commit 9e1d0b4
committed
Fix from_format crash on multi-character literal blocks
Formatter.parse() runs re.escape() on the format string first, so a
literal block like [de] arrives as \[de\]. The token regex only
suppressed the characters immediately adjacent to the brackets, so token
letters in the middle of a multi-character literal (for example the d and
e in [del]) were still tokenized, raising AttributeError or a "redefinition
of group name" re.error.
Match the whole escaped literal block as a single token in _FROM_FORMAT_RE
and unwrap it in _replace_tokens, keeping the inner text as a literal.
Fixes #9711 parent b99bd14 commit 9e1d0b4
2 files changed
Lines changed: 22 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
| 69 | + | |
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| |||
664 | 664 | | |
665 | 665 | | |
666 | 666 | | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
667 | 672 | | |
668 | 673 | | |
669 | 674 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
57 | 57 | | |
58 | 58 | | |
59 | 59 | | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
60 | 76 | | |
61 | 77 | | |
62 | 78 | | |
| |||
0 commit comments