[CalendarServer-changes] [15080] CalendarServer/branches/users/sredmond/clientsim/calendarserver

[source_changes at macosforge.org]

Revision: 15080
          http://trac.calendarserver.org//changeset/15080
Author:   sredmond at apple.com
Date:     2015-08-31 13:06:29 -0700 (Mon, 31 Aug 2015)
Log Message:
-----------
Updates AMP Push library to ignore device token for unsubscribe requets

Modified Paths:
--------------
    CalendarServer/branches/users/sredmond/clientsim/calendarserver/push/amppush.py
    CalendarServer/branches/users/sredmond/clientsim/calendarserver/tools/ampnotifications.py

Modified: CalendarServer/branches/users/sredmond/clientsim/calendarserver/push/amppush.py
===================================================================
--- CalendarServer/branches/users/sredmond/clientsim/calendarserver/push/amppush.py	2015-08-30 15:37:55 UTC (rev 15079)
+++ CalendarServer/branches/users/sredmond/clientsim/calendarserver/push/amppush.py	2015-08-31 20:06:29 UTC (rev 15080)
@@ -42,7 +42,7 @@
 
 
 class UnsubscribeFromID(amp.Command):
-    arguments = [('token', amp.String()), ('id', amp.String())]
+    arguments = [('id', amp.String())]
     response = [('status', amp.String())]
 
 
@@ -257,7 +257,7 @@
         return {"status" : "OK"}
     SubscribeToID.responder(subscribe)
 
-    def unsubscribe(self, token, id):
+    def unsubscribe(self, id):
         try:
             del self.subscriptions[id]
         except KeyError:
@@ -353,7 +353,8 @@
     @type host: string
     @param port: AMP port to connect to
     @type port: integer
-    @param ids: The push IDs to subscribe to
+    @param ids: The push IDs to subscribe to (if 'any', the client
+        will be subscribed to all notifications)
     @type ids: list of strings
     @param callback: The method to call whenever a notification is
         received.

Modified: CalendarServer/branches/users/sredmond/clientsim/calendarserver/tools/ampnotifications.py
===================================================================
--- CalendarServer/branches/users/sredmond/clientsim/calendarserver/tools/ampnotifications.py	2015-08-30 15:37:55 UTC (rev 15079)
+++ CalendarServer/branches/users/sredmond/clientsim/calendarserver/tools/ampnotifications.py	2015-08-31 20:06:29 UTC (rev 15080)
@@ -73,7 +73,6 @@
 
 
 def main():
-
     try:
         (optargs, args) = getopt(
             sys.argv[1:], "f:hp:s:v", [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150831/e7e91869/attachment.html>