summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-19 17:36:45 +0000
committerRichard van der Hoff <richard@matrix.org>2018-02-01 12:41:34 +0000
commite15d4ea2482827035e31945f514b9d4c67086c37 (patch)
treeb1bcfac2d648189d20942a57b09900d5c17ccbd0 /synapse
parentFix docstring for StateHandler.resolve_state_groups (diff)
downloadsynapse-e15d4ea2482827035e31945f514b9d4c67086c37.tar.xz
More docstring fixes
Fix a couple of errors in docstrings
Diffstat (limited to 'synapse')
-rw-r--r--synapse/state.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 2bc7e584c3..1071635ac4 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -434,8 +434,8 @@ def resolve_events_with_state_map(state_sets, state_map):
             state_sets.
 
     Returns
-        dict[(str, str), synapse.events.FrozenEvent]:
-            a map from (type, state_key) to event.
+        dict[(str, str), str]:
+            a map from (type, state_key) to event_id.
     """
     if len(state_sets) == 1:
         return state_sets[0]
@@ -497,8 +497,8 @@ def resolve_events_with_factory(state_sets, state_map_factory):
             a Deferred of dict of event_id to event.
 
     Returns
-        Deferred[dict[(str, str), synapse.events.FrozenEvent]]:
-            a map from (type, state_key) to event.
+        Deferred[dict[(str, str), str]]:
+            a map from (type, state_key) to event_id.
     """
     if len(state_sets) == 1:
         defer.returnValue(state_sets[0])