[CalendarServer-changes] [176] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Sep 21 19:17:24 PDT 2006
Revision: 176
http://trac.macosforge.org/projects/collaboration/changeset/176
Author: wsanchez at apple.com
Date: 2006-09-21 19:17:23 -0700 (Thu, 21 Sep 2006)
Log Message:
-----------
Twisted r18218.
Modified Paths:
--------------
CalendarServer/trunk/run
CalendarServer/trunk/twistedcaldav/repository.py
CalendarServer/trunk/twistedcaldav/static.py
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2006-09-22 01:33:34 UTC (rev 175)
+++ CalendarServer/trunk/run 2006-09-22 02:17:23 UTC (rev 176)
@@ -415,7 +415,7 @@
;;
esac;
svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608";
- svn_get "Twisted" "${twisted}" "${svn_uri}" 18209;
+ svn_get "Twisted" "${twisted}" "${svn_uri}" 18218;
fi;
py_install "Twisted" "${twisted}";
Modified: CalendarServer/trunk/twistedcaldav/repository.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/repository.py 2006-09-22 01:33:34 UTC (rev 175)
+++ CalendarServer/trunk/twistedcaldav/repository.py 2006-09-22 02:17:23 UTC (rev 176)
@@ -31,8 +31,6 @@
from twisted.web2.dav.element.base import PCDATAElement
from twisted.web2.dav.element.parser import lookupElement
from twisted.web2.dav.resource import TwistedACLInheritable
-from twisted.web2.dav.resource import TwistedACLProperty
-from twisted.web2.dav.resource import TwistedPrincipalCollectionSetProperty
from twisted.web2.dav.static import DAVFile
from twisted.web2.dav.util import joinURL
from twistedcaldav import caldavxml
@@ -218,7 +216,7 @@
return
# Create the private property
- pcs = TwistedPrincipalCollectionSetProperty(davxml.HRef.fromString(self.principalCollection.uri))
+ pcs = davxml.PrincipalCollectionSet(davxml.HRef.fromString(self.principalCollection.uri))
self.collection.resource.writeDeadProperty(pcs)
class Collection (object):
@@ -630,8 +628,8 @@
inbox.writeDeadProperty(customxml.TwistedScheduleAutoRespond())
outbox = home.getChild("outbox")
- if outbox.hasDeadProperty(TwistedACLProperty()):
- outbox.removeDeadProperty(TwistedACLProperty())
+ if outbox.hasDeadProperty(davxml.ACL()):
+ outbox.removeDeadProperty(davxml.ACL())
calendars = []
for calendar in item.calendars:
Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py 2006-09-22 01:33:34 UTC (rev 175)
+++ CalendarServer/trunk/twistedcaldav/static.py 2006-09-22 02:17:23 UTC (rev 176)
@@ -40,16 +40,15 @@
from twisted.python.failure import Failure
from twisted.python.filepath import FilePath
from twisted.web2 import responsecode
+from twisted.web2.http import HTTPError, StatusResponse
from twisted.web2.dav import davxml
from twisted.web2.dav.auth import TwistedPasswordProperty
from twisted.web2.dav.fileop import mkcollection, rmdir
from twisted.web2.dav.http import ErrorResponse
from twisted.web2.dav.idav import IDAVResource
from twisted.web2.dav.resource import TwistedACLInheritable
-from twisted.web2.dav.resource import TwistedACLProperty
from twisted.web2.dav.static import DAVFile
from twisted.web2.dav.util import parentForURL, joinURL, bindMethods
-from twisted.web2.http import HTTPError, StatusResponse
from twistedcaldav import caldavxml
from twistedcaldav import customxml
@@ -735,8 +734,8 @@
inbox.writeDeadProperty(customxml.TwistedScheduleAutoRespond())
outbox = home.getChild("outbox")
- if outbox.hasDeadProperty(TwistedACLProperty()):
- outbox.removeDeadProperty(TwistedACLProperty())
+ if outbox.hasDeadProperty(davxml.ACL()):
+ outbox.removeDeadProperty(davxml.ACL())
calendars = []
for calendar in cals:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060921/60b36643/attachment.html
More information about the calendarserver-changes
mailing list