[CalendarServer-changes] [8136] CalendarServer/trunk/twistedcaldav/timezonestdservice.py

[source_changes at macosforge.org]

Revision: 8136
          http://trac.macosforge.org/projects/calendarserver/changeset/8136
Author:   cdaboo at apple.com
Date:     2011-10-03 02:50:00 -0700 (Mon, 03 Oct 2011)
Log Message:
-----------
Update to latest draft.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/timezonestdservice.py

Modified: CalendarServer/trunk/twistedcaldav/timezonestdservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezonestdservice.py	2011-09-30 16:20:20 UTC (rev 8135)
+++ CalendarServer/trunk/twistedcaldav/timezonestdservice.py	2011-10-03 09:50:00 UTC (rev 8136)
@@ -234,7 +234,7 @@
                 timezonexml.Action.fromString("list"),
                 timezonexml.Description.fromString("List timezones on the server"),
                 timezonexml.AcceptParameter(
-                    timezonexml.Name.fromString("changesince"),
+                    timezonexml.Name.fromString("changedsince"),
                     timezonexml.Required.fromString("false"),
                     timezonexml.Multi.fromString("false"),
                 ),
@@ -253,7 +253,7 @@
                 timezonexml.AcceptParameter(
                     timezonexml.Name.fromString("tzid"),
                     timezonexml.Required.fromString("true"),
-                    timezonexml.Multi.fromString("true"),
+                    timezonexml.Multi.fromString("false"),
                 ),
             ),
             
@@ -263,7 +263,7 @@
                 timezonexml.AcceptParameter(
                     timezonexml.Name.fromString("tzid"),
                     timezonexml.Required.fromString("true"),
-                    timezonexml.Multi.fromString("true"),
+                    timezonexml.Multi.fromString("false"),
                 ),
                 timezonexml.AcceptParameter(
                     timezonexml.Name.fromString("start"),
@@ -284,31 +284,31 @@
         Return a list of all timezones known to the server.
         """
         
-        changesince = request.args.get("changesince", ())
-        if len(changesince) > 1:
+        changedsince = request.args.get("changedsince", ())
+        if len(changedsince) > 1:
             raise HTTPError(StatusResponse(
                 responsecode.BAD_REQUEST,
-                "Invalid changesince query parameter",
+                "Invalid changedsince query parameter",
             ))
-        if len(changesince) == 1:
+        if len(changedsince) == 1:
             # Validate a date-time stamp
-            changesince = changesince[0]
+            changedsince = changedsince[0]
             try:
-                dt = PyCalendarDateTime.parseText(changesince)
+                dt = PyCalendarDateTime.parseText(changedsince)
             except ValueError:
                 raise HTTPError(StatusResponse(
                     responsecode.BAD_REQUEST,
-                    "Invalid changesince query parameter value",
+                    "Invalid changedsince query parameter value",
                 ))
             if not dt.utc():
                 raise HTTPError(StatusResponse(
                     responsecode.BAD_REQUEST,
-                    "Invalid changesince query parameter value",
+                    "Invalid changedsince query parameter value",
                 ))
                 
 
         timezones = []
-        for tz in self.timezones.listTimezones(changesince):
+        for tz in self.timezones.listTimezones(changedsince):
             timezones.append(
                 timezonexml.Summary(
                     timezonexml.Tzid.fromString(tz.tzid),
@@ -506,7 +506,7 @@
                     for alias in tz.aliases:
                         self.aliases[alias] = tz.tzid
 
-    def listTimezones(self, changesince):
+    def listTimezones(self, changedsince):
         """
         List timezones (not aliases) possibly changed since a particular dtstamp.
         """
@@ -517,7 +517,7 @@
                 continue
             
             # Detect timestamp changes
-            if changesince and tzinfo.dtstamp <= changesince:
+            if changedsince and tzinfo.dtstamp <= changedsince:
                 continue
             
             yield tzinfo
@@ -742,7 +742,7 @@
         # List all from the server
         url = "%s?action=list" % (self.uri,)
         if self.dtstamp:
-            url = "%s&changesince=%s" % (url, self.dtstamp,)
+            url = "%s&changedsince=%s" % (url, self.dtstamp,)
         response = (yield getURL(url))
         if response is None or response.code / 100 != 2:
             returnValue(None)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111003/8b5fdc79/attachment.html>