Merge branch 'anoa/full_search_upgraded_rooms' of github.com:matrix-o…

…rg/synapse into anoa/full_search_upgraded_rooms
matrix-org · Jan 24, 2019 · a383289 · a383289
2 parents e1781b0 + 03c8533
commit a383289
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
@@ -448,7 +448,7 @@ def with_room_ids(self, room_ids):
         """Returns a new filter with the given room IDs appended.
 
         Args:
-            room_ids (list): A list of room_ids.
+            room_ids (iterable[unicode]): The room_ids to add
 
         Returns:
             filter: A new filter including the given rooms and the old

diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
@@ -52,7 +52,7 @@ def get_old_rooms_from_upgraded_room(self, room_id):
             room_id (str): id of the room to search through.
 
         Returns:
-            Deferred[iterable[str]]: predecessor room ids
+            Deferred[iterable[unicode]]: predecessor room ids
         """
 
         historical_room_ids = []

diff --git a/synapse/storage/state.py b/synapse/storage/state.py
@@ -446,7 +446,7 @@ def get_room_predecessor(self, room_id):
             room_id (str)
 
         Returns:
-            Deferred[str]: predecessor room id
+            Deferred[unicode|None]: predecessor room id
         """
         state_ids = yield self.get_current_state_ids(room_id)
         create_id = state_ids.get((EventTypes.Create, ""))