[CalendarServer-changes] [150] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Mon Sep 18 18:14:11 PDT 2006
Revision: 150
Author: wsanchez at apple.com
Date: 2006-09-18 18:14:09 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
Switch to branch dav-acl-1608 in Twisted.
Modified Paths:
--------------
CalendarServer/trunk/run
CalendarServer/trunk/twistedcaldav/method/copymove.py
Removed Paths:
-------------
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.filter.patch
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.filter.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.filter.patch 2006-09-19 01:13:23 UTC (rev 149)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.filter.patch 2006-09-19 01:14:09 UTC (rev 150)
@@ -1,82 +0,0 @@
-Index: twisted/web2/dav/filter/__init__.py
-===================================================================
---- twisted/web2/dav/filter/__init__.py (revision 0)
-+++ twisted/web2/dav/filter/__init__.py (revision 0)
-@@ -0,0 +1,31 @@
-+##
-+# Copyright (c) 2006 Apple Computer, 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
-+##
-+
-+"""
-+Output filters.
-+"""
-+
-+__all__ = [
-+ "location",
-+]
-Index: twisted/web2/dav/filter/location.py
-===================================================================
---- twisted/web2/dav/filter/location.py (revision 0)
-+++ twisted/web2/dav/filter/location.py (revision 0)
-@@ -0,0 +1,41 @@
-+"""
-+Filter that adds a Location header to a response if the status is 201 Created.
-+"""
-+
-+__all__ = ['locationfilter']
-+
-+from twisted.web2 import responsecode
-+import urlparse
-+
-+def addlocation(request, location):
-+ """
-+ Ensure that the supplied location URI is added to any response to this request.
-+
-+ @param request: L{IRequest} the request whose response is to be modified.
-+ @param location: the C{str} containing the path relative URI for the location header value.
-+ """
-+
-+ def locationfilter(request, response): #@UnusedVariable
-+ """
-+ Add a Location header to the response if the status is 201. Note that the location
-+ value must be a valid URI (already % encoded etc).
-+
-+ @param request: L{IRequest} for the current request.
-+ @param response: L{IResponse} for the response to add the header to.
-+ @return: the original L{IResponse} with (or without) the added header.
-+ """
-+
-+ if (response.code == responsecode.CREATED):
-+ # Check to see whether we have an absolute URI or not. If not, have the request
-+ # turn it into an absolute URI.
-+ (scheme, host, path, params, querystring, fragment) = urlparse.urlparse(location)
-+ if scheme == '':
-+ abslocation = request.unparseURL(path=location)
-+ else:
-+ abslocation = location
-+
-+ response.headers.setHeader('location', abslocation)
-+ return response
-+
-+ request.addResponseFilter(locationfilter)
-+ return
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2006-09-19 01:13:23 UTC (rev 149)
+++ CalendarServer/trunk/run 2006-09-19 01:14:09 UTC (rev 150)
@@ -406,13 +406,16 @@
#
if ! "${disable_setup}"; then
- if [ "${USER}" == "wsanchez" ]; then
- svn_uri="svn+ssh://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
- else
- svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
- fi;
-
- svn_get "Twisted" "${twisted}" "${svn_uri}" 18165;
+ case "${USER}" in
+ wsanchez)
+ proto="svn+ssh";
+ ;;
+ *)
+ proto="svn";
+ ;;
+ esac;
+ svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608";
+ svn_get "Twisted" "${twisted}" "${svn_uri}" 18204;
fi;
py_install "Twisted" "${twisted}";
@@ -448,11 +451,15 @@
vobject="${top}/vobject";
if ! "${disable_setup}"; then
- if [ "${USER}" == "cyrusdaboo" ]; then
- svn_uri="svn+ssh://cdaboo@svn.osafoundation.org/svn/vobject/trunk";
- else
- svn_uri="http://svn.osafoundation.org/vobject/trunk";
- fi;
+ case "${USER}" in
+ cyrusdaboo)
+ base="svn+ssh://cdaboo@svn.osafoundation.org/svn";
+ ;;
+ *)
+ base="http://svn.osafoundation.org";
+ ;;
+ esac;
+ svn_uri="${base}/vobject/trunk";
svn_get "vObject" "${vobject}" "${svn_uri}" 147;
fi;
py_install "vObject" "${vobject}";
Modified: CalendarServer/trunk/twistedcaldav/method/copymove.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/copymove.py 2006-09-19 01:13:23 UTC (rev 149)
+++ CalendarServer/trunk/twistedcaldav/method/copymove.py 2006-09-19 01:14:09 UTC (rev 150)
@@ -27,8 +27,8 @@
from twisted.internet.defer import deferredGenerator, waitForDeferred
from twisted.python import log
from twisted.web2 import responsecode
+from twisted.web2.filter.location import addLocation
from twisted.web2.dav import davxml
-from twisted.web2.dav.filter.location import addlocation
from twisted.web2.dav.http import ErrorResponse
from twisted.web2.dav.util import parentForURL
from twisted.web2.http import StatusResponse, HTTPError
@@ -99,7 +99,7 @@
)
# May need to add a location header
- addlocation(request, destination_uri)
+ addLocation(request, destination_uri)
x = waitForDeferred(storeCalendarObjectResource(
request = request,
@@ -183,7 +183,7 @@
))
# May need to add a location header
- addlocation(request, destination_uri)
+ addLocation(request, destination_uri)
x = waitForDeferred(storeCalendarObjectResource(
request = request,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060918/eefc4447/attachment.html
More information about the calendarserver-changes
mailing list