diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py
index b79f2d4b27..1cac5fff4e 100644
--- a/synapse/push/__init__.py
+++ b/synapse/push/__init__.py
@@ -269,8 +269,9 @@ class Pusher(object):
def dispatch_push(self, p, tweaks):
"""
Overridden by implementing classes to actually deliver the notification
- :param p: The event to notify for as a single event from the event stream
- :return: If the notification was delivered, an array containing any
+ Args:
+ p The event to notify for as a single event from the event stream
+ Returns: If the notification was delivered, an array containing any
pushkeys that were rejected by the push gateway.
False if the notification could not be delivered (ie.
should be retried).
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
|
