Oops, bad merge: needed to change the base class of the rest servlets too.

2 files changed, 4 insertions, 4 deletions

diff --git a/synapse/rest/client/v1/push_rule.py b/synapse/rest/client/v1/push_rule.py

index 50bf5b9008..00fed42f44 100644
--- a/synapse/rest/client/v1/push_rule.py
+++ b/synapse/rest/client/v1/push_rule.py
@@ -17,13 +17,13 @@ from twisted.internet import defer
 
 from synapse.api.errors import SynapseError, Codes, UnrecognizedRequestError, NotFoundError, \
     StoreError
-from base import RestServlet, client_path_pattern
+from .base import ClientV1RestServlet, client_path_pattern
 from synapse.storage.push_rule import InconsistentRuleException, RuleNotFoundException
 
 import json
 
 
-class PushRuleRestServlet(RestServlet):
+class PushRuleRestServlet(ClientV1RestServlet):
     PATTERN = client_path_pattern("/pushrules/.*$")
     PRIORITY_CLASS_MAP = {
         'underride': 0,
diff --git a/synapse/rest/client/v1/pusher.py b/synapse/rest/client/v1/pusher.py

index 4659c9b1d9..80a11890a3 100644
--- a/synapse/rest/client/v1/pusher.py
+++ b/synapse/rest/client/v1/pusher.py
@@ -17,12 +17,12 @@ from twisted.internet import defer
 
 from synapse.api.errors import SynapseError, Codes
 from synapse.push import PusherConfigException
-from base import RestServlet, client_path_pattern
+from .base import ClientV1RestServlet, client_path_pattern
 
 import json
 
 
-class PusherRestServlet(RestServlet):
+class PusherRestServlet(ClientV1RestServlet):
     PATTERN = client_path_pattern("/pushers/set$")
 
     @defer.inlineCallbacks