[CalendarServer-changes] [3901] CalendarServer/branches/exarkun/update-twisted-3816
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 19 14:41:56 PDT 2009
Revision: 3901
http://trac.macosforge.org/projects/calendarserver/changeset/3901
Author: exarkun at twistedmatrix.com
Date: 2009-03-19 14:41:55 -0700 (Thu, 19 Mar 2009)
Log Message:
-----------
migrated to Twisted
Modified Paths:
--------------
CalendarServer/branches/exarkun/update-twisted-3816/run
Removed Paths:
-------------
CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report.patch
CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch
CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
Deleted: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report.patch 2009-03-19 21:04:34 UTC (rev 3900)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report.patch 2009-03-19 21:41:55 UTC (rev 3901)
@@ -1,33 +0,0 @@
-Index: twisted/web2/dav/method/report.py
-===================================================================
---- twisted/web2/dav/method/report.py (revision 19773)
-+++ twisted/web2/dav/method/report.py (working copy)
-@@ -27,7 +27,11 @@
- WebDAV REPORT method
- """
-
--__all__ = ["http_REPORT"]
-+__all__ = [
-+ "max_number_of_matches",
-+ "NumberOfMatchesWithinLimits",
-+ "http_REPORT",
-+]
-
- import string
-
-@@ -43,7 +47,14 @@
- max_number_of_matches = 500
-
- class NumberOfMatchesWithinLimits(Exception):
-- pass
-+
-+ def __init__(self, limit):
-+
-+ super(NumberOfMatchesWithinLimits, self).__init__()
-+ self.limit = limit
-+
-+ def maxLimit(self):
-+ return self.limit
-
- def http_REPORT(self, request):
- """
Deleted: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch 2009-03-19 21:04:34 UTC (rev 3900)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_acl_principal_prop_set.patch 2009-03-19 21:41:55 UTC (rev 3901)
@@ -1,22 +0,0 @@
-Index: twisted/web2/dav/method/report_acl_principal_prop_set.py
-===================================================================
---- twisted/web2/dav/method/report_acl_principal_prop_set.py (revision 19773)
-+++ twisted/web2/dav/method/report_acl_principal_prop_set.py (working copy)
-@@ -103,7 +103,7 @@
- # Check size of results is within limit
- matchcount += 1
- if matchcount > max_number_of_matches:
-- raise NumberOfMatchesWithinLimits
-+ raise NumberOfMatchesWithinLimits(max_number_of_matches)
-
- resource = waitForDeferred(request.locateResource(str(principal)))
- yield resource
-@@ -144,7 +144,7 @@
- log.err("Too many matching components")
- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
-- (dav_namespace, "number-of-matches-within-limits")
-+ davxml.NumberOfMatchesWithinLimits()
- ))
-
- yield MultiStatusResponse(responses)
Deleted: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch 2009-03-19 21:04:34 UTC (rev 3900)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch 2009-03-19 21:41:55 UTC (rev 3901)
@@ -1,76 +0,0 @@
-Index: twisted/web2/dav/method/report_principal_match.py
-===================================================================
---- twisted/web2/dav/method/report_principal_match.py (revision 26343)
-+++ twisted/web2/dav/method/report_principal_match.py (working copy)
-@@ -102,7 +102,10 @@
- selfItems = [principal,]
-
- # Get group memberships for "self" and add each of those
-- selfItems.extend(principal.groupMemberships())
-+ d = waitForDeferred(principal.groupMemberships())
-+ yield d
-+ memberships = d.getResult()
-+ selfItems.extend(memberships)
-
- # Now add each principal found to the response provided the principal resource is a child of
- # the current resource.
-@@ -118,7 +121,7 @@
- # Check size of results is within limit
- matchcount += 1
- if matchcount > max_number_of_matches:
-- raise NumberOfMatchesWithinLimits
-+ raise NumberOfMatchesWithinLimits(max_number_of_matches)
-
- d = waitForDeferred(prop_common.responseForHref(
- request,
-@@ -158,22 +161,26 @@
- yield principal
- principal = principal.getResult()
-
-- if principal and isPrincipalResource(principal) and principal.principalMatch(myPrincipalURL):
-- # Check size of results is within limit
-- matchcount += 1
-- if matchcount > max_number_of_matches:
-- raise NumberOfMatchesWithinLimits
-+ if principal and isPrincipalResource(principal):
-+ d = waitForDeferred(principal.principalMatch(myPrincipalURL))
-+ yield d
-+ matched = d.getResult()
-+ if matched:
-+ # Check size of results is within limit
-+ matchcount += 1
-+ if matchcount > max_number_of_matches:
-+ raise NumberOfMatchesWithinLimits(max_number_of_matches)
-
-- d = waitForDeferred(prop_common.responseForHref(
-- request,
-- responses,
-- davxml.HRef.fromString(uri),
-- child,
-- propertiesForResource,
-- propElement
-- ))
-- yield d
-- d.getResult()
-+ d = waitForDeferred(prop_common.responseForHref(
-+ request,
-+ responses,
-+ davxml.HRef.fromString(uri),
-+ child,
-+ propertiesForResource,
-+ propElement
-+ ))
-+ yield d
-+ d.getResult()
- except HTTPError:
- # Just ignore a failure to access the property. We treat this like a property that does not exist
- # or does not match the principal.
-@@ -183,7 +190,7 @@
- log.err("Too many matching components in principal-match report")
- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
-- (dav_namespace, "number-of-matches-within-limits")
-+ davxml.NumberOfMatchesWithinLimits()
- ))
-
- yield MultiStatusResponse(responses)
Deleted: CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch 2009-03-19 21:04:34 UTC (rev 3900)
+++ CalendarServer/branches/exarkun/update-twisted-3816/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch 2009-03-19 21:41:55 UTC (rev 3901)
@@ -1,22 +0,0 @@
-Index: twisted/web2/dav/method/report_principal_property_search.py
-===================================================================
---- twisted/web2/dav/method/report_principal_property_search.py (revision 26343)
-+++ twisted/web2/dav/method/report_principal_property_search.py (working copy)
-@@ -161,7 +161,7 @@
- # Check size of results is within limit
- matchcount += 1
- if matchcount > max_number_of_matches:
-- raise NumberOfMatchesWithinLimits
-+ raise NumberOfMatchesWithinLimits(max_number_of_matches)
-
- d = waitForDeferred(prop_common.responseForHref(
- request,
-@@ -178,7 +178,7 @@
- log.err("Too many matching components in prinicpal-property-search report")
- raise HTTPError(ErrorResponse(
- responsecode.FORBIDDEN,
-- (dav_namespace, "number-of-matches-within-limits")
-+ davxml.NumberOfMatchesWithinLimits()
- ))
-
- yield MultiStatusResponse(responses)
Modified: CalendarServer/branches/exarkun/update-twisted-3816/run
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816/run 2009-03-19 21:04:34 UTC (rev 3900)
+++ CalendarServer/branches/exarkun/update-twisted-3816/run 2009-03-19 21:41:55 UTC (rev 3901)
@@ -636,7 +636,7 @@
;;
esac;
svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-take-two-3081-3";
-svn_get "Twisted" "${twisted}" "${svn_uri}" 26454;
+svn_get "Twisted" "${twisted}" "${svn_uri}" 26455;
# 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/20090319/7b6bf92c/attachment.html>
More information about the calendarserver-changes
mailing list