Remove Literal as it's broken on py35-olddeps

synapse/events/presence_router.py

@@ -15,8 +15,6 @@
 
 from typing import TYPE_CHECKING, Dict, Iterable, Set, Union
 
-from typing_extensions import Literal
-
 from synapse.api.presence import UserPresenceState
 
 if TYPE_CHECKING:
@@ -66,9 +64,7 @@ async def get_users_for_states(
         # Don't include any extra destinations for presence updates
         return {}
 
-    async def get_interested_users(
-        self, user_id: str
-    ) -> Union[Set[str], Literal["ALL"]]:
+    async def get_interested_users(self, user_id: str) -> Union[Set[str], str]:
         """
         Retrieve a list of users that the provided user is interested in receiving the presence
         of. Optionally, the str "ALL" can be returned to mean that this user should receive all

synapse/handlers/presence.py

@@ -38,7 +38,7 @@
 )
 
 from prometheus_client import Counter
-from typing_extensions import ContextManager, Literal
+from typing_extensions import ContextManager
 
 import synapse.metrics
 from synapse.api.constants import EventTypes, Membership, PresenceState
@@ -1134,6 +1134,8 @@ async def get_new_events(
 
                     return list(users_to_state.values()), max_token
 
+            assert not isinstance(users_interested_in, str)
+
             # The set of users that we're interested in and that have had a presence update.
             # We'll actually pull the presence updates for these users at the end.
             interested_and_updated_users = (
@@ -1257,7 +1259,7 @@ async def _get_interested_in(
         user: UserID,
         explicit_room_id: Optional[str] = None,
         cache_context: Optional[_CacheContext] = None,
-    ) -> Union[Set[str], Literal["ALL"]]:
+    ) -> Union[Set[str], str]:
         """Returns the set of users that the given user should see presence
         updates for.
 

tests/events/test_presence_router.py

@@ -15,7 +15,6 @@
 from typing import Dict, Iterable, List, Optional, Set, Union
 
 import attr
-from typing_extensions import Literal
 
 from synapse.handlers.presence import UserPresenceState
 from synapse.module_api import ModuleApi
@@ -47,10 +46,7 @@ async def get_users_for_states(
         }
         return users_to_state
 
-    async def get_interested_users(
-        self, user_id: str
-    ) -> Union[Set[str], Literal["ALL"]]:
-        print()
+    async def get_interested_users(self, user_id: str) -> Union[Set[str], str]:
         if user_id in self._config.users_who_should_receive_all_presence:
             return "ALL"