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

1 files changed, 3 insertions, 2 deletions

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).