[CalendarServer-changes] [4341] CalendarServer/trunk/lib-patches/Twisted
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 15 13:13:36 PDT 2009
Revision: 4341
http://trac.macosforge.org/projects/calendarserver/changeset/4341
Author: cdaboo at apple.com
Date: 2009-06-15 13:13:36 -0700 (Mon, 15 Jun 2009)
Log Message:
-----------
Fix missing import in resource.py. Get revision numbers right.
Modified Paths:
--------------
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2009-06-13 03:05:37 UTC (rev 4340)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2009-06-15 20:13:36 UTC (rev 4341)
@@ -1,6 +1,6 @@
Index: twisted/web2/auth/digest.py
===================================================================
---- twisted/web2/auth/digest.py (revision 26899)
+--- twisted/web2/auth/digest.py (revision 26969)
+++ twisted/web2/auth/digest.py (working copy)
@@ -138,11 +138,15 @@
implements(credentials.IUsernameHashedPassword,
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2009-06-13 03:05:37 UTC (rev 4340)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2009-06-15 20:13:36 UTC (rev 4341)
@@ -1,8 +1,23 @@
Index: twisted/web2/dav/resource.py
===================================================================
---- twisted/web2/dav/resource.py (revision 26899)
+--- twisted/web2/dav/resource.py (revision 26969)
+++ twisted/web2/dav/resource.py (working copy)
-@@ -1880,7 +1880,7 @@
+@@ -49,12 +49,13 @@
+ if not hasattr(__builtin__, "frozenset"):
+ import sets.ImmutableSet as frozenset
+
++import urllib
++
+ from zope.interface import implements
+ from twisted.python import log
+ from twisted.python.failure import Failure
+ from twisted.internet.defer import Deferred, maybeDeferred, succeed
+ from twisted.internet.defer import waitForDeferred, deferredGenerator
+-from twisted.cred.error import LoginFailed, UnauthorizedLogin
+ from twisted.internet import reactor
+ from twisted.web2 import responsecode
+ from twisted.web2.http import HTTPError, RedirectResponse, StatusResponse
+@@ -1880,7 +1881,7 @@
# If this is a collection and the URI doesn't end in "/", redirect.
#
if self.isCollection() and request.path[-1:] != "/":
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch 2009-06-13 03:05:37 UTC (rev 4340)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.server.patch 2009-06-15 20:13:36 UTC (rev 4341)
@@ -1,6 +1,6 @@
Index: twisted/web2/server.py
===================================================================
---- twisted/web2/server.py (revision 26899)
+--- twisted/web2/server.py (revision 26969)
+++ twisted/web2/server.py (working copy)
@@ -332,6 +332,16 @@
response = http.Response(responsecode.OK)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090615/09a6075d/attachment.html>
More information about the calendarserver-changes
mailing list