From 7e554aac86144ebde529aae259cd0895d4078f23 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 19 Jul 2016 10:18:40 +0100
Subject: [PATCH 1/2] Update docstring on Handlers.

To indicate it is deprecated.
---
 synapse/handlers/__init__.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index d28e07f0d..c512077cb 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -31,10 +31,22 @@ from .search import SearchHandler
 
 class Handlers(object):
 
-    """ A collection of all the event handlers.
+    """
+    Deprecated.
 
-    There's no need to lazily create these; we'll just make them all eagerly
-    at construction time.
+    At some point most of the classes whose name ended "Handler" were
+    accessed through this class.
+
+    However this makes it painful to unit test the handlers and to run cut
+    down versions of synapse that only use specific handlers because using a
+    single handler required creating all of the handlers. So some of the
+    handlers have been lifted out of the Handlers object and are now accessed
+    directly through the homeserver object itself.
+
+    Any new handlers should follow the new pattern of being accessed through
+    the homeserver object and should not be added to the Handlers object.
+
+    The remaining handlers should be moved out of the handlers object.
     """
 
     def __init__(self, hs):

From c41d52a04221d478220ede7ab389299918f113ca Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Tue, 19 Jul 2016 10:28:27 +0100
Subject: [PATCH 2/2] Summary line

---
 synapse/handlers/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/synapse/handlers/__init__.py b/synapse/handlers/__init__.py
index c512077cb..1a50a2ec9 100644
--- a/synapse/handlers/__init__.py
+++ b/synapse/handlers/__init__.py
@@ -31,8 +31,7 @@ from .search import SearchHandler
 
 class Handlers(object):
 
-    """
-    Deprecated.
+    """ Deprecated. A collection of handlers.
 
     At some point most of the classes whose name ended "Handler" were
     accessed through this class.