[CalendarServer-changes] [2239] CalendarServer/branches/users/wsanchez/twisted-update
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 17 21:05:30 PDT 2008
Revision: 2239
http://trac.macosforge.org/projects/calendarserver/changeset/2239
Author: wsanchez at apple.com
Date: 2008-03-17 21:05:29 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
Merge forward
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.__init__.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.auth.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.davxml.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.base.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.parser.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc2518.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc3744.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.http.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.idav.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.put.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.static.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.util.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
CalendarServer/branches/users/wsanchez/twisted-update/run
Removed Paths:
-------------
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc4331.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.__init__.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.__init__.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/__init__.py
===================================================================
---- twisted/web2/dav/__init__.py (revision 22891)
+--- twisted/web2/dav/__init__.py (revision 22939)
+++ twisted/web2/dav/__init__.py (working copy)
@@ -45,6 +45,7 @@
"noneprops",
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.auth.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.auth.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.auth.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/auth.py
===================================================================
---- twisted/web2/dav/auth.py (revision 22891)
+--- twisted/web2/dav/auth.py (revision 22939)
+++ twisted/web2/dav/auth.py (working copy)
@@ -40,7 +40,7 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.davxml.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/davxml.py
===================================================================
---- twisted/web2/dav/davxml.py (revision 22891)
+--- twisted/web2/dav/davxml.py (revision 22939)
+++ twisted/web2/dav/davxml.py (working copy)
@@ -45,6 +45,7 @@
from twisted.web2.dav.element.rfc2518 import *
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,10 +0,0 @@
-Index: twisted/web2/dav/element/__init__.py
-===================================================================
---- twisted/web2/dav/element/__init__.py (revision 22891)
-+++ twisted/web2/dav/element/__init__.py (working copy)
-@@ -35,4 +35,5 @@
- "rfc2518",
- "rfc3253",
- "rfc3744",
-+ "rfc4331",
- ]
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.base.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/base.py
===================================================================
---- twisted/web2/dav/element/base.py (revision 22891)
+--- twisted/web2/dav/element/base.py (revision 22939)
+++ twisted/web2/dav/element/base.py (working copy)
@@ -46,7 +46,7 @@
]
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.parser.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.parser.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.parser.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/parser.py
===================================================================
---- twisted/web2/dav/element/parser.py (revision 22891)
+--- twisted/web2/dav/element/parser.py (revision 22939)
+++ twisted/web2/dav/element/parser.py (working copy)
@@ -37,7 +37,7 @@
"WebDAVDocument",
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc2518.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc2518.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc2518.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/rfc2518.py
===================================================================
---- twisted/web2/dav/element/rfc2518.py (revision 22891)
+--- twisted/web2/dav/element/rfc2518.py (revision 22939)
+++ twisted/web2/dav/element/rfc2518.py (working copy)
@@ -59,8 +59,8 @@
"""
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc3744.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc3744.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc3744.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/rfc3744.py
===================================================================
---- twisted/web2/dav/element/rfc3744.py (revision 22891)
+--- twisted/web2/dav/element/rfc3744.py (revision 22939)
+++ twisted/web2/dav/element/rfc3744.py (working copy)
@@ -131,8 +131,8 @@
(dav_namespace, "self" ): (0, 1),
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc4331.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc4331.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc4331.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,60 +0,0 @@
-Index: twisted/web2/dav/element/rfc4331.py
-===================================================================
---- twisted/web2/dav/element/rfc4331.py (revision 0)
-+++ twisted/web2/dav/element/rfc4331.py (revision 0)
-@@ -0,0 +1,55 @@
-+##
-+# Copyright (c) 2005-2007 Apple Inc. All rights reserved.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to deal
-+# in the Software without restriction, including without limitation the rights
-+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+# copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in all
-+# copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+# SOFTWARE.
-+#
-+# DRI: Cyrus Daboo, cdaboo at apple.com
-+##
-+
-+"""
-+RFC 4331 (Quota and Size Properties for WebDAV Collections) XML Elements
-+
-+This module provides XML element definitions for use with WebDAV.
-+
-+See RFC 4331: http://www.ietf.org/rfc/rfc4331.txt
-+"""
-+
-+from twisted.web2.dav.element.base import WebDAVTextElement
-+
-+##
-+# Section 3 & 4 (Quota Properties)
-+##
-+
-+class QuotaAvailableBytes (WebDAVTextElement):
-+ """
-+ Property which contains the the number of bytes available under the
-+ current quota to store data in a collection (RFC 4331, section 3)
-+ """
-+ name = "quota-available-bytes"
-+ hidden = True
-+ protected = True
-+
-+class QuotaUsedBytes (WebDAVTextElement):
-+ """
-+ Property which contains the the number of bytes used under the
-+ current quota to store data in a collection (RFC 4331, section 4)
-+ """
-+ name = "quota-used-bytes"
-+ hidden = True
-+ protected = True
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.http.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.http.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.http.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/http.py
===================================================================
---- twisted/web2/dav/http.py (revision 22891)
+--- twisted/web2/dav/http.py (revision 22939)
+++ twisted/web2/dav/http.py (working copy)
@@ -69,10 +69,9 @@
"""
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.idav.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.idav.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.idav.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/idav.py
===================================================================
---- twisted/web2/dav/idav.py (revision 22891)
+--- twisted/web2/dav/idav.py (revision 22939)
+++ twisted/web2/dav/idav.py (working copy)
@@ -41,7 +41,7 @@
otherwise.
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/__init__.py
===================================================================
---- twisted/web2/dav/method/__init__.py (revision 22891)
+--- twisted/web2/dav/method/__init__.py (revision 22939)
+++ twisted/web2/dav/method/__init__.py (working copy)
@@ -40,6 +40,7 @@
"proppatch",
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/copymove.py
===================================================================
---- twisted/web2/dav/method/copymove.py (revision 22891)
+--- twisted/web2/dav/method/copymove.py (revision 22939)
+++ twisted/web2/dav/method/copymove.py (working copy)
@@ -34,11 +34,12 @@
from twisted.python import log
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.delete.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/delete.py
===================================================================
---- twisted/web2/dav/method/delete.py (revision 22891)
+--- twisted/web2/dav/method/delete.py (revision 22939)
+++ twisted/web2/dav/method/delete.py (working copy)
@@ -58,8 +58,28 @@
yield x
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/propfind.py
===================================================================
---- twisted/web2/dav/method/propfind.py (revision 22891)
+--- twisted/web2/dav/method/propfind.py (revision 22939)
+++ twisted/web2/dav/method/propfind.py (working copy)
@@ -200,7 +200,7 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.put.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/put.py
===================================================================
---- twisted/web2/dav/method/put.py (revision 22891)
+--- twisted/web2/dav/method/put.py (revision 22939)
+++ twisted/web2/dav/method/put.py (working copy)
@@ -34,7 +34,7 @@
from twisted.web2 import responsecode
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,105 +0,0 @@
-Index: twisted/web2/dav/method/report_principal_match.py
-===================================================================
---- twisted/web2/dav/method/report_principal_match.py (revision 22891)
-+++ twisted/web2/dav/method/report_principal_match.py (working copy)
-@@ -89,40 +89,61 @@
- responses = []
- matchcount = 0
-
-- selfPrincipal = self.currentPrincipal(request).children[0]
-+ selfPrincipalURL = self.currentPrincipal(request).children[0]
-
-- # Do some optimisation of access control calculation by determining any inherited ACLs outside of
-- # the child resource loop and supply those to the checkPrivileges on each child.
-- filteredaces = waitForDeferred(self.inheritedACEsforChildren(request))
-- yield filteredaces
-- filteredaces = filteredaces.getResult()
--
-- children = []
-- d = waitForDeferred(self.findChildren("infinity", request, lambda x, y: children.append((x,y)),
-- privileges=(davxml.Read(),), inherited_aces=filteredaces))
-- yield d
-- d.getResult()
--
- if lookForPrincipals:
-
-- for child, uri in children:
-- if isPrincipalResource(child) and child.principalMatch(selfPrincipal):
-- # Check size of results is within limit
-- matchcount += 1
-- if matchcount > max_number_of_matches:
-- raise NumberOfMatchesWithinLimits
-+ # Find the set of principals that represent "self".
-+
-+ # First add "self"
-+ principal = waitForDeferred(request.locateResource(str(selfPrincipalURL)))
-+ yield principal
-+ principal = principal.getResult()
-+ selfItems = [principal,]
-+
-+ # Get group memberships for "self" and add each of those
-+ selfItems.extend(principal.groupMemberships())
-+
-+ # Now add each principal found to the response provided the principal resource is a child of
-+ # the current resource.
-+ for principal in selfItems:
-+ # Get all the URIs that point to the principal resource
-+ # FIXME: making the assumption that the principalURL() is the URL of the resource we found
-+ principal_uris = [principal.principalURL()]
-+ principal_uris.extend(principal.alternateURIs())
-+
-+ # Compare each one to the request URI and return at most one that matches
-+ for uri in principal_uris:
-+ if uri.startswith(request.uri):
-+ # Check size of results is within limit
-+ matchcount += 1
-+ if matchcount > max_number_of_matches:
-+ raise NumberOfMatchesWithinLimits
-+
-+ d = waitForDeferred(prop_common.responseForHref(
-+ request,
-+ responses,
-+ davxml.HRef.fromString(uri),
-+ principal,
-+ propertiesForResource,
-+ propElement
-+ ))
-+ yield d
-+ d.getResult()
-+ break
-+ else:
-+ # Do some optimisation of access control calculation by determining any inherited ACLs outside of
-+ # the child resource loop and supply those to the checkPrivileges on each child.
-+ filteredaces = waitForDeferred(self.inheritedACEsforChildren(request))
-+ yield filteredaces
-+ filteredaces = filteredaces.getResult()
-+
-+ children = []
-+ d = waitForDeferred(self.findChildren("infinity", request, lambda x, y: children.append((x,y)),
-+ privileges=(davxml.Read(),), inherited_aces=filteredaces))
-+ yield d
-+ d.getResult()
-
-- d = waitForDeferred(prop_common.responseForHref(
-- request,
-- responses,
-- davxml.HRef.fromString(uri),
-- child,
-- propertiesForResource,
-- propElement
-- ))
-- yield d
-- d.getResult()
-- else:
- for child, uri in children:
- # Try to read the requested property from this resource
- try:
-@@ -137,7 +158,7 @@
- yield principal
- principal = principal.getResult()
-
-- if principal and isPrincipalResource(principal) and principal.principalMatch(selfPrincipal):
-+ if principal and isPrincipalResource(principal) and principal.principalMatch(selfPrincipalURL):
- # Check size of results is within limit
- matchcount += 1
- if matchcount > max_number_of_matches:
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,20 +0,0 @@
-Index: twisted/web2/dav/method/report_principal_property_search.py
-===================================================================
---- twisted/web2/dav/method/report_principal_property_search.py (revision 22891)
-+++ twisted/web2/dav/method/report_principal_property_search.py (working copy)
-@@ -127,13 +127,8 @@
- matchcount = 0
-
- if applyTo:
-- # Get the principal collection set
-- pset = waitForDeferred(self.principalCollections(request))
-- yield pset
-- pset = pset.getResult()
--
-- for phref in pset:
-- uri = str(phref)
-+ for principalCollection in self.principalCollections():
-+ uri = principalCollection.principalCollectionURL()
- resource = waitForDeferred(request.locateResource(uri))
- yield resource
- resource = resource.getResult()
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.resource.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.resource.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/resource.py
===================================================================
---- twisted/web2/dav/resource.py (revision 22891)
+--- twisted/web2/dav/resource.py (revision 22939)
+++ twisted/web2/dav/resource.py (working copy)
@@ -40,10 +40,18 @@
"unauthenticatedPrincipal",
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.static.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.static.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.static.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/static.py
===================================================================
---- twisted/web2/dav/static.py (revision 22891)
+--- twisted/web2/dav/static.py (revision 22939)
+++ twisted/web2/dav/static.py (working copy)
@@ -28,16 +28,16 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_acl.py
===================================================================
---- twisted/web2/dav/test/test_acl.py (revision 22891)
+--- twisted/web2/dav/test/test_acl.py (revision 22939)
+++ twisted/web2/dav/test/test_acl.py (working copy)
@@ -30,6 +30,7 @@
from twisted.web2.auth import basic
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_prop.py
===================================================================
---- twisted/web2/dav/test/test_prop.py (revision 22891)
+--- twisted/web2/dav/test/test_prop.py (revision 22939)
+++ twisted/web2/dav/test/test_prop.py (working copy)
@@ -21,6 +21,8 @@
#
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_resource.py
===================================================================
---- twisted/web2/dav/test/test_resource.py (revision 22891)
+--- twisted/web2/dav/test/test_resource.py (revision 22939)
+++ twisted/web2/dav/test/test_resource.py (working copy)
@@ -204,8 +204,7 @@
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,10 +0,0 @@
-Index: twisted/web2/dav/test/test_static.py
-===================================================================
---- twisted/web2/dav/test/test_static.py (revision 22891)
-+++ twisted/web2/dav/test/test_static.py (working copy)
-@@ -60,3 +60,5 @@
- d.addCallback(assertListing)
-
- return d
-+
-+ test_renderPrivileges.todo = "We changed the rules here; test needs an update"
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.util.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.util.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.util.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/util.py
===================================================================
---- twisted/web2/dav/util.py (revision 22891)
+--- twisted/web2/dav/util.py (revision 22939)
+++ twisted/web2/dav/util.py (working copy)
@@ -76,7 +76,9 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-03-18 04:05:29 UTC (rev 2239)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/xattrprops.py
===================================================================
---- twisted/web2/dav/xattrprops.py (revision 22891)
+--- twisted/web2/dav/xattrprops.py (revision 22939)
+++ twisted/web2/dav/xattrprops.py (working copy)
@@ -33,12 +33,18 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/run
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/run 2008-03-18 02:55:42 UTC (rev 2238)
+++ CalendarServer/branches/users/wsanchez/twisted-update/run 2008-03-18 04:05:29 UTC (rev 2239)
@@ -530,7 +530,7 @@
;;
esac;
svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-take-two-3081-1";
-svn_get "Twisted" "${twisted}" "${svn_uri}" 22891;
+svn_get "Twisted" "${twisted}" "${svn_uri}" 22939;
# No py_build step, since we tend to do edit Twisted, we want the sources in
# PYTHONPATH, not a build directory.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080317/b4e2b569/attachment-0001.html
More information about the calendarserver-changes
mailing list