summary refs log tree commit diff
path: root/synapse/handlers/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-16 20:08:32 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-16 20:08:32 +0100
commit53e171f345d43ab133e8382cfdf639cd81dfcc4b (patch)
tree2ceaa5da4938c60de600373fa02930cece959f11 /synapse/handlers/__init__.py
parentRemove get_joined_rooms_for_user from RoomMemberHandler (diff)
parentDon't inherit PresenceHandler from BaseHandler, remove references to self.hs ... (diff)
downloadsynapse-53e171f345d43ab133e8382cfdf639cd81dfcc4b.tar.xz
Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler
Diffstat (limited to 'synapse/handlers/__init__.py')
-rw-r--r--synapse/handlers/__init__.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index f4dbf47c1d..60e31b68ff 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -24,7 +24,6 @@ from .message import MessageHandler
 from .events import EventStreamHandler, EventHandler
 from .federation import FederationHandler
 from .profile import ProfileHandler
-from .presence import PresenceHandler
 from .directory import DirectoryHandler
 from .typing import TypingNotificationHandler
 from .admin import AdminHandler
@@ -53,7 +52,6 @@ class Handlers(object):
         self.event_handler = EventHandler(hs)
         self.federation_handler = FederationHandler(hs)
         self.profile_handler = ProfileHandler(hs)
-        self.presence_handler = PresenceHandler(hs)
         self.room_list_handler = RoomListHandler(hs)
         self.directory_handler = DirectoryHandler(hs)
         self.typing_notification_handler = TypingNotificationHandler(hs)