Repository navigation
Commit ce757cd
authored
#2432 (round 10 of #1103) changed register's RegistryError message from
"...must be a Protocol subclass" to "...must be a ProtocolBase subclass"
in pcapkit/protocols/protocol.py and foundation/registry/protocols.py, and
updated the locked assertions in tests/protocols/test_register_class_guard_unit.py
and tests/foundation/registry/test_protocols.py to match. This was a mistake.
* The wording naming Protocol (not ProtocolBase) is a deliberate, ratified
decision: #1016 ruled the message's reader is third-party code, who should
be told to subclass Protocol -- ProtocolBase's own docstring says it is
"for internal use only". The owner approved that reasoning, #2316
re-confirmed it as out of scope to change, and #2420's commit explicitly
records "the error message names Protocol" as the kept half of the split
between the Raises: clause (ProtocolBase) and the raised message
(Protocol). #2420 also notes it already caught and corrected one prior
accidental flip of this exact wording.
* Reverted both raise sites and the four locked test assertions back to
"Protocol subclass".
* Also fixed a citation left by #2432: tests/foundation/reassembly/
test_deferred_pickle_2423_unit.py cited :issue:`2424` (the merged PR, not
an issue) where it meant the underlying fix, tracked as #2423 -- matches
the file's existing :issue:`2423` citation style and the changelog's own
"(:issue:`2423`, :issue:`2425`, :pr:`2424`)" citation.
#2432's other two fixes (a stale docstring, a cross-reference to a moved
EnumField) are correct and untouched.
Refs #1016, #2316, #2420
Refs #1103
Build: tests/protocols/test_register_class_guard_unit.py,
tests/foundation/registry/test_protocols.py,
tests/foundation/reassembly/test_deferred_pickle_2423_unit.py pass; full
tests/project/ run shows no new failures (13 pre-existing failures, all in
unrelated subprocess/network-dependent tests, none touching these files).
1 parent c2f1089 commit ce757cd
5 files changed
Lines changed: 6 additions & 6 deletions
File tree
- pcapkit
- foundation/registry
- protocols
- tests
- foundation
- reassembly
- registry
- protocols
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
221 | 221 | | |
222 | 222 | | |
223 | 223 | | |
224 | | - | |
| 224 | + | |
225 | 225 | | |
226 | 226 | | |
227 | 227 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1139 | 1139 | | |
1140 | 1140 | | |
1141 | 1141 | | |
1142 | | - | |
| 1142 | + | |
1143 | 1143 | | |
1144 | 1144 | | |
1145 | 1145 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
245 | 245 | | |
246 | 246 | | |
247 | 247 | | |
248 | | - | |
| 248 | + | |
249 | 249 | | |
250 | 250 | | |
251 | 251 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
438 | 438 | | |
439 | 439 | | |
440 | 440 | | |
441 | | - | |
| 441 | + | |
442 | 442 | | |
443 | 443 | | |
444 | 444 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
| 85 | + | |
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| |||
107 | 107 | | |
108 | 108 | | |
109 | 109 | | |
110 | | - | |
| 110 | + | |
111 | 111 | | |
112 | 112 | | |
113 | 113 | | |
| |||
0 commit comments