From 3ce6900715b519bb1e04f232c43c0a34e50ea5ad Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 28 Jul 2026 16:23:24 -0500 Subject: [PATCH] Rename `parse` to `from_json_dict` --- synapse/events/__init__.py | 2 +- synapse/handlers/federation.py | 8 ++++++-- synapse/handlers/sliding_sync/room_lists.py | 2 +- synapse/storage/databases/main/events.py | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py index 6859d84995..371f271dc2 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py @@ -213,7 +213,7 @@ class StrippedStateEvent: } @staticmethod - def parse(raw_stripped_event: Any) -> "StrippedStateEvent" | None: + def from_json_dict(raw_stripped_event: JsonDict) -> "StrippedStateEvent" | None: """ Given a raw value from an event's `unsigned` field, attempt to parse it into a `StrippedStateEvent`. diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index be53d3c797..8202be4e8b 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1135,7 +1135,9 @@ class FederationHandler: parsed_stripped_room_state = [] for raw_stripped_event in stripped_room_state: # Parse each stripped event - parsed_stripped_event = StrippedStateEvent.parse(raw_stripped_event) + parsed_stripped_event = StrippedStateEvent.from_json_dict( + raw_stripped_event + ) if parsed_stripped_event is None: # Drop any invalid stripped state events as this is spec'ed and we # might as well save the client from dealing with anything crazy. @@ -1216,7 +1218,9 @@ class FederationHandler: includes_create_event = True # Parse the stripped events to ensure it has all of the fields necessary - parsed_stripped_event = StrippedStateEvent.parse(raw_stripped_event) + parsed_stripped_event = StrippedStateEvent.from_json_dict( + raw_stripped_event + ) if parsed_stripped_event is None: raise ValueError("Unable to parse as stripped event") parsed_stripped_room_state.append(parsed_stripped_event) diff --git a/synapse/handlers/sliding_sync/room_lists.py b/synapse/handlers/sliding_sync/room_lists.py index cca4e6d284..f4d1f484e7 100644 --- a/synapse/handlers/sliding_sync/room_lists.py +++ b/synapse/handlers/sliding_sync/room_lists.py @@ -1617,7 +1617,7 @@ class SlidingSyncRoomLists: stripped_state_map = {} if isinstance(raw_stripped_state_events, list): for raw_stripped_event in raw_stripped_state_events: - stripped_state_event = StrippedStateEvent.parse( + stripped_state_event = StrippedStateEvent.from_json_dict( raw_stripped_event ) if stripped_state_event is not None: diff --git a/synapse/storage/databases/main/events.py b/synapse/storage/databases/main/events.py index 8f50b6b0e6..e290087352 100644 --- a/synapse/storage/databases/main/events.py +++ b/synapse/storage/databases/main/events.py @@ -2251,7 +2251,9 @@ class PersistEventsStore: stripped_state_map: MutableStateMap[StrippedStateEvent] = {} if isinstance(unsigned_stripped_state_events, list): for raw_stripped_event in unsigned_stripped_state_events: - stripped_state_event = StrippedStateEvent.parse(raw_stripped_event) + stripped_state_event = StrippedStateEvent.from_json_dict( + raw_stripped_event + ) if stripped_state_event is not None: stripped_state_map[ (