Merge branch 'develop' of github.com:matrix-org/synapse into rejections

1 files changed, 0 insertions, 24 deletions

diff --git a/synapse/rest/base.py b/synapse/http/servlet.py

index c583945527..d5ccf2742f 100644
--- a/synapse/rest/base.py
+++ b/synapse/http/servlet.py
@@ -14,9 +14,6 @@
 # limitations under the License.
 
 """ This module contains base REST classes for constructing REST servlets. """
-from synapse.api.urls import CLIENT_PREFIX
-from synapse.rest.transactions import HttpTransactionStore
-import re
 
 import logging
 
@@ -24,19 +21,6 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def client_path_pattern(path_regex):
-    """Creates a regex compiled client path with the correct client path
-    prefix.
-
-    Args:
-        path_regex (str): The regex string to match. This should NOT have a ^
-        as this will be prefixed.
-    Returns:
-        SRE_Pattern
-    """
-    return re.compile("^" + CLIENT_PREFIX + path_regex)
-
-
 class RestServlet(object):
 
     """ A Synapse REST Servlet.
@@ -59,14 +43,6 @@ class RestServlet(object):
     into the appropriate HTTP response.
     """
 
-    def __init__(self, hs):
-        self.hs = hs
-
-        self.handlers = hs.get_handlers()
-        self.builder_factory = hs.get_event_builder_factory()
-        self.auth = hs.get_auth()
-        self.txns = HttpTransactionStore()
-
     def register(self, http_server):
         """ Register this servlet with the given HTTP server. """
         if hasattr(self, "PATTERN"):