[CalendarServer-changes] [322]
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 12:44:09 PDT 2006
Revision: 322
http://trac.macosforge.org/projects/calendarserver/changeset/322
Author: cdaboo at apple.com
Date: 2006-10-27 12:44:09 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Updates for latest Twisted branch.
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.__init__.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.davxml.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.base.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.idav.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.put.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.log.patch
CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.server.patch
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.__init__.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.__init__.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/__init__.py
===================================================================
---- twisted/web2/dav/__init__.py (revision 18375)
+--- twisted/web2/dav/__init__.py (revision 18545)
+++ twisted/web2/dav/__init__.py (working copy)
@@ -45,6 +45,7 @@
"noneprops",
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.davxml.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/davxml.py
===================================================================
---- twisted/web2/dav/davxml.py (revision 18375)
+--- twisted/web2/dav/davxml.py (revision 18545)
+++ twisted/web2/dav/davxml.py (working copy)
@@ -45,6 +45,7 @@
from twisted.web2.dav.element.rfc2518 import *
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/__init__.py
===================================================================
---- twisted/web2/dav/element/__init__.py (revision 18375)
+--- twisted/web2/dav/element/__init__.py (revision 18545)
+++ twisted/web2/dav/element/__init__.py (working copy)
@@ -35,4 +35,5 @@
"rfc2518",
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.base.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/base.py
===================================================================
---- twisted/web2/dav/element/base.py (revision 18375)
+--- twisted/web2/dav/element/base.py (revision 18545)
+++ twisted/web2/dav/element/base.py (working copy)
@@ -190,14 +190,93 @@
return child in self.children
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.idav.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.idav.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.idav.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/idav.py
===================================================================
---- twisted/web2/dav/idav.py (revision 18375)
+--- twisted/web2/dav/idav.py (revision 18545)
+++ twisted/web2/dav/idav.py (working copy)
@@ -41,7 +41,7 @@
otherwise.
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/__init__.py
===================================================================
---- twisted/web2/dav/method/__init__.py (revision 18375)
+--- twisted/web2/dav/method/__init__.py (revision 18545)
+++ twisted/web2/dav/method/__init__.py (working copy)
@@ -40,6 +40,7 @@
"proppatch",
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,17 +1,8 @@
Index: twisted/web2/dav/method/copymove.py
===================================================================
---- twisted/web2/dav/method/copymove.py (revision 18479)
+--- twisted/web2/dav/method/copymove.py (revision 18545)
+++ twisted/web2/dav/method/copymove.py (working copy)
-@@ -29,8 +29,6 @@
-
- __all__ = ["http_COPY", "http_MOVE"]
-
--import urlparse
--
- from twisted.python import log
- from twisted.internet.defer import waitForDeferred, deferredGenerator
- from twisted.web2 import responsecode
-@@ -38,7 +36,7 @@
+@@ -38,7 +38,7 @@
from twisted.web2.filter.location import addLocation
from twisted.web2.dav import davxml
from twisted.web2.dav.idav import IDAVResource
@@ -20,7 +11,7 @@
from twisted.web2.dav.util import parentForURL
# FIXME: This is circular
-@@ -81,7 +79,15 @@
+@@ -81,7 +81,15 @@
# May need to add a location header
addLocation(request, destination_uri)
@@ -37,7 +28,7 @@
yield x
yield x.getResult()
-@@ -144,7 +150,14 @@
+@@ -144,7 +152,14 @@
log.err(msg)
raise HTTPError(StatusResponse(responsecode.BAD_REQUEST, msg))
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/delete.py
===================================================================
---- twisted/web2/dav/method/delete.py (revision 18375)
+--- twisted/web2/dav/method/delete.py (revision 18545)
+++ twisted/web2/dav/method/delete.py (working copy)
@@ -58,8 +58,28 @@
yield x
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.put.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/put.py
===================================================================
---- twisted/web2/dav/method/put.py (revision 18375)
+--- twisted/web2/dav/method/put.py (revision 18545)
+++ twisted/web2/dav/method/put.py (working copy)
@@ -34,7 +34,7 @@
from twisted.web2 import responsecode
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -26,7 +26,7 @@
return succeed(qname in self.liveProperties or self.deadProperties().contains(qname))
def readProperty(self, property, request):
-@@ -286,7 +296,33 @@
+@@ -286,6 +296,32 @@
d.addCallback(gotACL)
return d
return ifAllowed((davxml.ReadACL(),), callback)
@@ -43,7 +43,7 @@
+ d = self.quota(request)
+ d.addCallback(callback)
+ return d
-
++
+ if name == "quota-used-bytes":
+ def callback(qvalue):
+ if qvalue is None:
@@ -56,11 +56,10 @@
+ d = self.quota(request)
+ d.addCallback(callback)
+ return d
-+
+
elif namespace == twisted_dav_namespace:
if name == "resource-class":
- class ResourceClass (davxml.WebDAVTextElement):
-@@ -366,12 +402,26 @@
+@@ -366,6 +402,18 @@
# FIXME: A set would be better here, that that's a python 2.4+ feature.
qnames = list(self.liveProperties)
@@ -79,15 +78,17 @@
for qname in self.deadProperties().list():
if (qname not in qnames) and (qname[0] != twisted_private_namespace):
qnames.append(qname)
+@@ -370,7 +418,9 @@
+ if (qname not in qnames) and (qname[0] != twisted_private_namespace):
+ qnames.append(qname)
- return succeed(qnames)
+ yield qnames
-
-+ listProperties = deferredGenerator(listProperties)
+
++ listProperties = deferredGenerator(listProperties)
+
def listAllprop(self, request):
"""
- Some DAV properties should not be returned to a C{DAV:allprop} query.
@@ -535,7 +585,7 @@
completionDeferred.callback(None)
else:
@@ -97,59 +98,7 @@
child.addCallback(checkPrivileges)
child.addCallbacks(gotChild, checkPrivilegesError, (childpath,))
child.addErrback(completionDeferred.errback)
-@@ -544,6 +594,43 @@
-
- return completionDeferred
-
-+# def findChildren(self, depth, request, callback, privileges=None, inherited_aces=None):
-+# """
-+# See L{IDAVResource.findChildren}.
-+#
-+# This implementation works for C{depth} values of C{"0"}, C{"1"},
-+# and C{"infinity"}. As long as C{self.listChildren} is implemented
-+# """
-+# assert depth in ("0", "1", "infinity"), "Invalid depth: %s" % (depth,)
-+#
-+# completionDeferred = Deferred()
-+#
-+# if depth != "0" and self.isCollection():
-+# basepath = request.urlForResource(self)
-+# children = self.listChildren()
-+# for childname in children:
-+# childpath = joinURL(basepath, childname)
-+# child = waitForDeferred(request.locateResource(childpath))
-+# yield child
-+# child = child.getResult()
-+# if privileges is not None:
-+# try:
-+# d = waitForDeferred(child.checkPrivileges(request, privileges, inherited_aces=inherited_aces))
-+# yield d
-+# d.getResult()
-+# except AccessDeniedError:
-+# continue
-+# if child.isCollection():
-+# callback(child, childpath + "/")
-+# if depth == "infinity":
-+# d = waitForDeferred(child.findChildren(depth, request, callback, privileges))
-+# yield d
-+# d.getResult()
-+# else:
-+# callback(child, childpath)
-+#
-+# findChildren = deferredGenerator(findChildren)
-+
- def supportedReports(self):
- """
- See L{IDAVResource.supportedReports}.
-@@ -1014,7 +1101,6 @@
- url = request.urlForResource(self)
-
- assert url is not None, "urlForResource(self) returned None for resource %s" % (self,)
--
- return url
-
- try:
-@@ -1511,6 +1597,265 @@
+@@ -1511,6 +1561,265 @@
return None
##
@@ -415,7 +364,7 @@
# HTTP
##
-@@ -1558,7 +1903,7 @@
+@@ -1558,7 +1867,7 @@
"""
DAV resource with no children.
"""
@@ -424,7 +373,7 @@
return succeed(None)
class DAVPrincipalResource (DAVLeafResource):
-@@ -1712,6 +2057,37 @@
+@@ -1712,6 +2021,37 @@
davxml.registerElement(TwistedACLInheritable)
davxml.ACE.allowed_children[(twisted_dav_namespace, "inheritable")] = (0, 1)
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,19 +1,17 @@
Index: twisted/web2/dav/test/test_prop.py
===================================================================
---- twisted/web2/dav/test/test_prop.py (revision 18479)
+--- twisted/web2/dav/test/test_prop.py (revision 18545)
+++ twisted/web2/dav/test/test_prop.py (working copy)
-@@ -21,10 +21,8 @@
+@@ -21,6 +21,8 @@
#
# DRI: Wilfredo Sanchez, wsanchez at apple.com
##
--
++from twisted.web2.dav.element.rfc4331 import QuotaUsedBytes
++from twisted.web2.dav.element.rfc4331 import QuotaAvailableBytes
+
import random
--from twisted.trial.unittest import SkipTest
- from twisted.web2 import responsecode
- from twisted.web2.iweb import IResponse
- from twisted.web2.stream import MemoryStream
-@@ -37,13 +35,14 @@
+@@ -37,7 +39,14 @@
from twisted.web2.dav.test.util import serialize
import twisted.web2.dav.test.util
@@ -23,14 +21,9 @@
+ (dav_namespace, "quota-available-bytes" ),
+ (dav_namespace, "quota-used-bytes" ),
+)
-
--#
--# See whether dead properties are available
--#
--from twisted.web2.dav.noneprops import NonePropertyStore
--from twisted.web2.dav.static import DeadPropertyStore
++
+live_properties = [lookupElement(qname)() for qname in DAVResource.liveProperties if (qname[0] == dav_namespace) and qname not in dynamicLiveProperties]
+print live_properties
- class PROP(twisted.web2.dav.test.util.TestCase):
- """
+ #
+ # See whether dead properties are available
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/xattrprops.py
===================================================================
---- twisted/web2/dav/xattrprops.py (revision 18375)
+--- twisted/web2/dav/xattrprops.py (revision 18545)
+++ twisted/web2/dav/xattrprops.py (working copy)
@@ -66,16 +66,8 @@
deadPropertyXattrPrefix = "user."
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.log.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.log.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.log.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/log.py
===================================================================
---- twisted/web2/log.py (revision 18375)
+--- twisted/web2/log.py (revision 18545)
+++ twisted/web2/log.py (working copy)
@@ -88,7 +88,7 @@
class LogWrapperResource(resource.WrapperResource):
Modified: CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.server.patch 2006-10-27 19:43:33 UTC (rev 321)
+++ CalendarServer/branches/users/wsanchez/acl-2/lib-patches/Twisted/twisted.web2.server.patch 2006-10-27 19:44:09 UTC (rev 322)
@@ -1,6 +1,6 @@
Index: twisted/web2/server.py
===================================================================
---- twisted/web2/server.py (revision 18375)
+--- twisted/web2/server.py (revision 18545)
+++ twisted/web2/server.py (working copy)
@@ -1,6 +1,8 @@
# -*- test-case-name: twisted.web2.test.test_server -*-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061027/93de0de8/attachment.html
More information about the calendarserver-changes
mailing list