Commit bf32594
committed
fix: restore suffix_acronyms_ambiguous wiring lost in a git race
nameparser/config/__init__.py's suffix_acronyms_ambiguous attribute
(import, docstring, type hint, constructor param, and __init__
assignment -- all from Task 1, commit 135395b) was accidentally
reverted by commit c2efbd8. Root cause: a review subagent was
running concurrently in this same shared worktree directory and
appears to have checked out an older commit in place (rather than in
an isolated copy) to compare pre/post-PR behavior for its "verified
against unmodified master" claims; that checkout's staged state got
swept into c2efbd8's commit alongside my own staged changes, since
`git commit` includes everything staged, not just newly `git add`ed
paths.
The working tree itself was never wrong -- parser.py's handle_match()
has referenced self.C.suffix_acronyms_ambiguous correctly this whole
time, and pytest passed after every commit since the corruption,
because pytest reads the filesystem, not git history. Only the
*committed* nameparser/config/__init__.py (and, transiently, the
already-pushed PR branch) lacked the attribute -- a fresh clone of
c2efbd8..4e91b7a would have raised AttributeError on any name
containing parens/quotes. Verified via `git show HEAD:...` and
`git diff 135395b HEAD -- nameparser/config/__init__.py` that this
commit is the only remaining gap; suffixes.py, parser.py, and the
tests were independently re-added correctly in later commits.
Also includes docs/usage.rst and docs/customize.rst updates
documenting the new suffix_acronyms_ambiguous behavior and
SUFFIX_ACRONYMS_AMBIGUOUS constant.1 parent 4e91b7a commit bf32594
3 files changed
Lines changed: 49 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
147 | 147 | | |
148 | 148 | | |
149 | 149 | | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
150 | 191 | | |
151 | 192 | | |
152 | 193 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
47 | 48 | | |
| |||
236 | 237 | | |
237 | 238 | | |
238 | 239 | | |
239 | | - | |
| 240 | + | |
240 | 241 | | |
| 242 | + | |
| 243 | + | |
241 | 244 | | |
242 | 245 | | |
243 | 246 | | |
| |||
257 | 260 | | |
258 | 261 | | |
259 | 262 | | |
| 263 | + | |
260 | 264 | | |
261 | 265 | | |
262 | 266 | | |
| |||
388 | 392 | | |
389 | 393 | | |
390 | 394 | | |
| 395 | + | |
391 | 396 | | |
392 | 397 | | |
393 | 398 | | |
| |||
406 | 411 | | |
407 | 412 | | |
408 | 413 | | |
| 414 | + | |
409 | 415 | | |
410 | 416 | | |
411 | 417 | | |
| |||
0 commit comments