[CalendarServer-changes] [626] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/ static.py

source_changes at macosforge.org source_changes at macosforge.org
Thu Nov 30 18:45:23 PST 2006


Revision: 626
          http://trac.macosforge.org/projects/calendarserver/changeset/626
Author:   wsanchez at apple.com
Date:     2006-11-30 18:45:22 -0800 (Thu, 30 Nov 2006)

Log Message:
-----------
Don't need fromString()

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py	2006-12-01 02:44:36 UTC (rev 625)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/static.py	2006-12-01 02:45:22 UTC (rev 626)
@@ -648,7 +648,7 @@
         # Set calendar-free-busy-set on Inbox if not already present
         inbox = self.getChild("inbox")
         if not inbox.hasDeadProperty(caldavxml.CalendarFreeBusySet()):
-            fbset = caldavxml.CalendarFreeBusySet(*[davxml.HRef.fromString(uri) for uri in calendars])
+            fbset = caldavxml.CalendarFreeBusySet(*[davxml.HRef(uri) for uri in calendars])
             inbox.writeDeadProperty(fbset)
             
         # Do drop box if requested
@@ -790,11 +790,11 @@
     #     """
     #     
     #     if pswd:
-    #         self.writeDeadProperty(TwistedPasswordProperty.fromString(pswd))
+    #         self.writeDeadProperty(TwistedPasswordProperty(pswd))
     #     else:
     #         self.removeDeadProperty(TwistedPasswordProperty())
     #     if name:
-    #         self.writeDeadProperty(davxml.DisplayName.fromString(name))
+    #         self.writeDeadProperty(davxml.DisplayName(name))
     #     else:
     #         self.removeDeadProperty(davxml.DisplayName())
     #     if cuaddrs:
@@ -806,7 +806,7 @@
     #         self.setAccessControlList(
     #             davxml.ACL(
     #                 davxml.ACE(
-    #                     davxml.Principal(davxml.HRef.fromString(self._url)),
+    #                     davxml.Principal(davxml.HRef(self._url)),
     #                     davxml.Grant(
     #                         davxml.Privilege(davxml.Read()),
     #                     ),
@@ -821,7 +821,7 @@
     #     # Create calendar home if we already have the resource, otherwise simply record
     #     # the URL as the calendar-home-set
     #     if cuhome[1] is None:
-    #         self.writeDeadProperty(caldavxml.CalendarHomeSet(davxml.HRef.fromString(cuhome[0])))
+    #         self.writeDeadProperty(caldavxml.CalendarHomeSet(davxml.HRef(cuhome[0])))
     #     else:
     #         homeURL = joinURL(cuhome[0], self.principalUID())
     #         home = FilePath(os.path.join(cuhome[1].fp.path, self.principalUID()))
@@ -843,7 +843,7 @@
     #                             ),
     #                         ),
     #                         davxml.ACE(
-    #                             davxml.Principal(davxml.HRef.fromString(self._url)),
+    #                             davxml.Principal(davxml.HRef(self._url)),
     #                             davxml.Grant(
     #                                 davxml.Privilege(davxml.All()),
     #                             ),
@@ -856,9 +856,9 @@
     #         home.setQuotaRoot(None, quota)
     #     
     #         # Save the calendar-home-set, schedule-inbox and schedule-outbox properties
-    #         self.writeDeadProperty(caldavxml.CalendarHomeSet(davxml.HRef.fromString(homeURL + "/")))
-    #         self.writeDeadProperty(caldavxml.ScheduleInboxURL(davxml.HRef.fromString(joinURL(homeURL, "inbox/"))))
-    #         self.writeDeadProperty(caldavxml.ScheduleOutboxURL(davxml.HRef.fromString(joinURL(homeURL, "outbox/"))))
+    #         self.writeDeadProperty(caldavxml.CalendarHomeSet(davxml.HRef(homeURL + "/")))
+    #         self.writeDeadProperty(caldavxml.ScheduleInboxURL(davxml.HRef(joinURL(homeURL, "inbox/"))))
+    #         self.writeDeadProperty(caldavxml.ScheduleOutboxURL(davxml.HRef(joinURL(homeURL, "outbox/"))))
     #         
     #         # Set ACLs on inbox and outbox
     #         if resetacl or not home_exists:
@@ -906,7 +906,7 @@
     #         # Set calendar-free-busy-set on Inbox if not already present
     #         inbox = home.getChild("inbox")
     #         if not inbox.hasDeadProperty(caldavxml.CalendarFreeBusySet()):
-    #             fbset = caldavxml.CalendarFreeBusySet(*[davxml.HRef.fromString(uri) for uri in calendars])
+    #             fbset = caldavxml.CalendarFreeBusySet(*[davxml.HRef(uri) for uri in calendars])
     #             inbox.writeDeadProperty(fbset)
     #             
     #         # Do drop box if requested

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061130/c808c33d/attachment.html


More information about the calendarserver-changes mailing list