[CalendarServer-changes] [142] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Sep 15 16:08:30 PDT 2006
Revision: 142
Author: wsanchez at apple.com
Date: 2006-09-15 16:08:28 -0700 (Fri, 15 Sep 2006)
Log Message:
-----------
Applied some patched to Twisted
Modified Paths:
--------------
CalendarServer/trunk/run
Removed Paths:
-------------
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.basic.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.interfaces.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.wrapper.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.basic.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.basic.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.basic.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,13 +0,0 @@
-Index: twisted/web2/auth/basic.py
-===================================================================
---- twisted/web2/auth/basic.py (revision 17932)
-+++ twisted/web2/auth/basic.py (working copy)
-@@ -20,7 +20,7 @@
- def getChallenge(self, peer):
- return {'realm': self.realm}
-
-- def decode(self, response, method=None):
-+ def decode(self, response, request):
- try:
- creds = (response + '===').decode('base64')
- except:
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.digest.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,19 +0,0 @@
-Index: twisted/web2/auth/digest.py
-===================================================================
---- twisted/web2/auth/digest.py (revision 17932)
-+++ twisted/web2/auth/digest.py (working copy)
-@@ -154,7 +154,7 @@
- 'algorithm': self.algorithm,
- 'realm': self.realm}
-
-- def decode(self, response, method='GET'):
-+ def decode(self, response, request):
- def unq(s):
- if s[0] == s[-1] == '"':
- return s[1:-1]
-@@ -172,4 +172,4 @@
-
- del self.outstanding[auth['opaque']]
-
-- return DigestedCredentials(username, method, self.realm, auth)
-+ return DigestedCredentials(username, request.method, self.realm, auth)
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.interfaces.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.interfaces.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.interfaces.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,24 +0,0 @@
-Index: twisted/web2/auth/interfaces.py
-===================================================================
---- twisted/web2/auth/interfaces.py (revision 17932)
-+++ twisted/web2/auth/interfaces.py (working copy)
-@@ -13,7 +13,7 @@
- @return: dictionary of challenge arguments
- """
-
-- def decode(response, method=None):
-+ def decode(response, request):
- """Create a credentials object from the given response.
- May raise twisted.cred.error.LoginFailed if the response is invalid.
-
-@@ -20,8 +20,8 @@
- @type response: C{str}
- @param response: scheme specific response string
-
-- @type method: C{str}
-- @param method: the method by which this response was sent
-+ @type request: L{twisted.web2.server.Request}
-+ @param request: the request being processed
-
- @return: ICredentials
- """
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.wrapper.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.wrapper.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.auth.wrapper.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,13 +0,0 @@
-Index: twisted/web2/auth/wrapper.py
-===================================================================
---- twisted/web2/auth/wrapper.py (revision 17932)
-+++ twisted/web2/auth/wrapper.py (working copy)
-@@ -87,7 +87,7 @@
- return UnauthorizedResource(self.credentialFactories)
-
- try:
-- creds = factory.decode(response, req.method)
-+ creds = factory.decode(response, req)
- except error.LoginFailed:
- return UnauthorizedResource(self.credentialFactories)
-
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,13 +0,0 @@
-Index: twisted/web2/dav/resource.py
-===================================================================
---- twisted/web2/dav/resource.py (revision 18074)
-+++ twisted/web2/dav/resource.py (working copy)
-@@ -599,7 +599,7 @@
- else:
- factory = request.credentialFactories[authHeader[0]]
-
-- creds = factory.decode(authHeader[1], request.method)
-+ creds = factory.decode(authHeader[1], request)
-
- # Try to match principals in each principal collection on
- # the resource
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.static.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,13 +0,0 @@
-Index: twisted/web2/dav/static.py
-===================================================================
---- twisted/web2/dav/static.py (revision 18074)
-+++ twisted/web2/dav/static.py (working copy)
-@@ -34,6 +34,8 @@
- from twisted.internet.defer import succeed, deferredGenerator, waitForDeferred
- from twisted.web2.static import File
- from twisted.web2 import dirlist
-+from twisted.web2 import http
-+from twisted.web2 import responsecode
- from twisted.web2.dav import davxml
- from twisted.web2.dav.idav import IDAVResource
- from twisted.web2.dav.resource import DAVResource
Deleted: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.test.test_httpauth.patch 2006-09-15 23:08:28 UTC (rev 142)
@@ -1,71 +0,0 @@
-Index: twisted/web2/test/test_httpauth.py
-===================================================================
---- twisted/web2/test/test_httpauth.py (revision 17932)
-+++ twisted/web2/test/test_httpauth.py (working copy)
-@@ -2,6 +2,7 @@
- from twisted.internet import defer
- from twisted.cred import error
- from twisted.web2.auth import basic, digest, wrapper
-+from twisted.web2.test.test_server import SimpleRequest
-
- from twisted.web2.test import test_server
-
-@@ -25,7 +26,7 @@
- self.username,
- self.password))
-
-- creds = self.credentialFactory.decode(response)
-+ creds = self.credentialFactory.decode(response, SimpleRequest(None, 'GET', '/'))
- self.failUnless(creds.checkPassword(self.password))
-
- def testIncorrectPassword(self):
-@@ -33,7 +34,7 @@
- self.username,
- 'incorrectPassword'))
-
-- creds = self.credentialFactory.decode(response)
-+ creds = self.credentialFactory.decode(response, SimpleRequest(None, 'GET', '/'))
- self.failIf(creds.checkPassword(self.password))
-
- def testIncorrectPadding(self):
-@@ -43,7 +44,7 @@
-
- response = response.strip('=')
-
-- creds = self.credentialFactory.decode(response)
-+ creds = self.credentialFactory.decode(response, SimpleRequest(None, 'GET', '/'))
- self.failUnless(creds.checkPassword(self.password))
-
- def testInvalidCredentials(self):
-@@ -51,7 +52,7 @@
-
- self.assertRaises(error.LoginFailed,
- self.credentialFactory.decode,
-- response)
-+ response, SimpleRequest(None, 'GET', '/'))
-
- challengeResponse = ('digest', {'nonce': '178288758716122392881254770685',
- 'qop': 'auth', 'realm': 'test realm',
-@@ -74,7 +75,7 @@
- def testResponse(self):
- challenge = self.credentialFactory.getChallenge(None)
-
-- creds = self.credentialFactory.decode(authRequest, 'GET')
-+ creds = self.credentialFactory.decode(authRequest, SimpleRequest(None, 'GET', '/'))
- self.failUnless(creds.checkPassword('password'))
-
- def testFailsWithDifferentMethod(self):
-@@ -80,11 +81,11 @@
- def testFailsWithDifferentMethod(self):
- challenge = self.credentialFactory.getChallenge(None)
-
-- creds = self.credentialFactory.decode(authRequest, 'POST')
-+ creds = self.credentialFactory.decode(authRequest, SimpleRequest(None, 'POST', '/'))
- self.failIf(creds.checkPassword('password'))
-
- def testNoUsername(self):
-- self.assertRaises(error.LoginFailed, self.credentialFactory.decode, namelessAuthRequest, 'GET')
-+ self.assertRaises(error.LoginFailed, self.credentialFactory.decode, namelessAuthRequest, SimpleRequest(None, 'GET', '/'))
-
- from zope.interface import Interface, implements
- from twisted.cred import portal, checkers
Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run 2006-09-15 22:02:55 UTC (rev 141)
+++ CalendarServer/trunk/run 2006-09-15 23:08:28 UTC (rev 142)
@@ -412,7 +412,7 @@
svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
fi;
- svn_get "Twisted" "${twisted}" "${svn_uri}" 18164;
+ svn_get "Twisted" "${twisted}" "${svn_uri}" 18165;
fi;
py_install "Twisted" "${twisted}";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060915/ba60662b/attachment.html
More information about the calendarserver-changes
mailing list