[CalendarServer-changes] [2233]
CalendarServer/branches/users/wsanchez/twisted-update
source_changes at macosforge.org
source_changes at macosforge.org
Mon Mar 17 16:46:18 PDT 2008
Revision: 2233
http://trac.macosforge.org/projects/calendarserver/changeset/2233
Author: wsanchez at apple.com
Date: 2008-03-17 16:46:18 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
Rough pass at merging forward.
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.runner.procmon.patch
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.__init__.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.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.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.test.test_static.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/lib-patches/Twisted/twisted.web2.http.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.log.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.server.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.test.test_http.patch
CalendarServer/branches/users/wsanchez/twisted-update/run
Added Paths:
-----------
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugin.patch
Removed Paths:
-------------
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.conch.test.test_keys.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugins.__init__.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_plugin.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_tcp.patch
CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web.test.test_webclient.patch
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.conch.test.test_keys.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.conch.test.test_keys.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.conch.test.test_keys.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,16 +0,0 @@
-Index: twisted/conch/test/test_keys.py
-===================================================================
---- twisted/conch/test/test_keys.py (revision 19773)
-+++ twisted/conch/test/test_keys.py (working copy)
-@@ -4,10 +4,10 @@
-
- try:
- import Crypto
-+ from twisted.conch.ssh import keys
- except ImportError:
- Crypto = None
-
--from twisted.conch.ssh import keys
- from twisted.trial import unittest
-
- publicRSA_openssh = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEArzJx8OYOnJmzf4tfBEvLi8DVPrJ3/c9k2I/Az64fxjHf9imyRJbixtQhlH9lfNjUIx+4LmrJH5QNRsFporcHDKOTwTTYLh5KmRpslkYHRivcJSkbh/C+BR3utDS555mV comment"
Added: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugin.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugin.patch (rev 0)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugin.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -0,0 +1,12 @@
+Index: twisted/plugin.py
+===================================================================
+--- twisted/plugin.py (revision 22891)
++++ twisted/plugin.py (working copy)
+@@ -241,6 +241,7 @@
+ for x
+ in sys.path
+ if
++ not x.startswith('/System') and
+ not os.path.exists(os.path.join(x, *package + ['__init__.py']))]
+
+ __all__ = ['getPlugins', 'pluginPackagePaths']
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugins.__init__.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugins.__init__.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.plugins.__init__.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,12 +0,0 @@
-Index: twisted/plugins/__init__.py
-===================================================================
---- twisted/plugins/__init__.py (revision 19773)
-+++ twisted/plugins/__init__.py (working copy)
-@@ -12,6 +12,6 @@
- """
-
- import os, sys
--__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path]
-+__path__ = [os.path.abspath(os.path.join(x, 'twisted', 'plugins')) for x in sys.path if not x.startswith('/System')]
-
- __all__ = [] # nothing to see here, move along, move along
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.runner.procmon.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.runner.procmon.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.runner.procmon.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/runner/procmon.py
===================================================================
---- twisted/runner/procmon.py (revision 19773)
+--- twisted/runner/procmon.py (revision 22891)
+++ twisted/runner/procmon.py (working copy)
@@ -59,6 +59,9 @@
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_plugin.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_plugin.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_plugin.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,11 +0,0 @@
-Index: twisted/test/test_plugin.py
-===================================================================
---- twisted/test/test_plugin.py (revision 19773)
-+++ twisted/test/test_plugin.py (working copy)
-@@ -518,3 +518,6 @@
- self.assertEqual(len(self.flushLoggedErrors()), 0)
- self.assertIn('one', self.getAllPlugins())
- self.assertEqual(len(self.flushLoggedErrors()), 1)
-+
-+
-+ test_newPluginsOnReadOnlyPath.skip = "Seems not to work on OS X 10.4 buildbot machine."
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_tcp.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_tcp.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.test.test_tcp.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,13 +0,0 @@
-Index: twisted/test/test_tcp.py
-===================================================================
---- twisted/test/test_tcp.py (revision 19773)
-+++ twisted/test/test_tcp.py (working copy)
-@@ -1294,6 +1294,8 @@
- self.client.transport.loseConnection()
- log.flushErrors(RuntimeError)
- return d.addCallback(check)
-+
-+ testReadNotificationRaises.todo = "self.f.protocol is None"
-
- def testWriteNotificationRaises(self):
- self.client.writeConnectionLost = self.aBug
Deleted: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web.test.test_webclient.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web.test.test_webclient.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web.test.test_webclient.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,13 +0,0 @@
-Index: twisted/web/test/test_webclient.py
-===================================================================
---- twisted/web/test/test_webclient.py (revision 19773)
-+++ twisted/web/test/test_webclient.py (working copy)
-@@ -206,6 +206,8 @@
- d.addBoth(self._cleanupDownloadPageError3)
- return d
-
-+ testDownloadPageError3.skip = "Seems not to work on OS X."
-+
- def _cleanupDownloadPageError3(self, ignored):
- os.chmod("unwritable", 0700)
- os.unlink("unwritable")
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.__init__.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/__init__.py
===================================================================
---- twisted/web2/dav/__init__.py (revision 19773)
+--- twisted/web2/dav/__init__.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.auth.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/auth.py
===================================================================
---- twisted/web2/dav/auth.py (revision 19773)
+--- twisted/web2/dav/auth.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.davxml.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/davxml.py
===================================================================
---- twisted/web2/dav/davxml.py (revision 19773)
+--- twisted/web2/dav/davxml.py (revision 22891)
+++ twisted/web2/dav/davxml.py (working copy)
@@ -45,6 +45,7 @@
from twisted.web2.dav.element.rfc2518 import *
Modified: 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.__init__.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/__init__.py
===================================================================
---- twisted/web2/dav/element/__init__.py (revision 19773)
+--- twisted/web2/dav/element/__init__.py (revision 22891)
+++ twisted/web2/dav/element/__init__.py (working copy)
@@ -35,4 +35,5 @@
"rfc2518",
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,8 +1,8 @@
Index: twisted/web2/dav/element/base.py
===================================================================
---- twisted/web2/dav/element/base.py (revision 19773)
+--- twisted/web2/dav/element/base.py (revision 22891)
+++ twisted/web2/dav/element/base.py (working copy)
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
]
import string
@@ -11,7 +11,7 @@
import xml.dom.minidom
import datetime
-@@ -90,6 +90,35 @@
+@@ -91,6 +91,35 @@
raise NotImplementedError("WebDAVElement subclass %s is not implemented."
% (self.__class__.__name__,))
@@ -47,7 +47,7 @@
#
# Validate that children are of acceptable types
#
-@@ -102,13 +131,10 @@
+@@ -103,13 +132,10 @@
my_children = []
for child in children:
@@ -63,36 +63,35 @@
for allowed, (min, max) in allowed_children.items():
if type(allowed) == type and isinstance(child, allowed):
-@@ -145,21 +171,20 @@
-
+@@ -147,9 +173,7 @@
if self.allowed_attributes:
for name in attributes:
-- if name in self.allowed_attributes:
+ if name in self.allowed_attributes:
- my_attributes[name] = attributes[name]
- else:
- log.msg("Attribute %s is unexpected and therefore ignored in %s element"
-- % (name, self.sname()))
-+ if name not in self.allowed_attributes:
-+ log.msg("Attribute %s is unexpected in %s element" % (name, self.sname()))
-+ my_attributes[name] = attributes[name]
-
++ log.msg("Attribute %s is unexpected in %s element"
+ % (name, self.sname()))
+
for name, required in self.allowed_attributes.items():
- if required and name not in my_attributes:
+@@ -157,11 +181,13 @@
raise ValueError("Attribute %s is required in %s element"
% (name, self.sname()))
- elif not isinstance(self, WebDAVUnknownElement):
- if attributes:
- log.msg("Attributes %s are unexpected and therefore ignored in %s element"
-+ else:
-+ if not isinstance(self, WebDAVUnknownElement) and attributes:
-+ log.msg("Attributes %s are unexpected in %s element"
++ elif attributes:
++ if not isinstance(self, WebDAVUnknownElement):
++ log.msg("Attributes %s are unexpected and in %s element"
% (attributes.keys(), self.sname()))
-+ my_attributes.update(attributes)
++ my_attributes.update(attributes)
++
self.attributes = my_attributes
-@@ -190,14 +215,93 @@
+ def __str__(self):
+@@ -191,14 +217,93 @@
return child in self.children
def writeXML(self, output):
@@ -190,7 +189,7 @@
def element(self, document):
element = document.createElementNS(self.namespace, self.name)
-@@ -285,6 +389,9 @@
+@@ -286,6 +391,9 @@
self.data = data
@@ -200,7 +199,7 @@
def __str__(self):
return str(self.data)
-@@ -324,6 +431,22 @@
+@@ -325,6 +433,22 @@
log.err("Invalid PCDATA: %r" % (self.data,))
raise
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.parser.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/parser.py
===================================================================
---- twisted/web2/dav/element/parser.py (revision 19773)
+--- twisted/web2/dav/element/parser.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc2518.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/rfc2518.py
===================================================================
---- twisted/web2/dav/element/rfc2518.py (revision 19773)
+--- twisted/web2/dav/element/rfc2518.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.element.rfc3744.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/element/rfc3744.py
===================================================================
---- twisted/web2/dav/element/rfc3744.py (revision 19773)
+--- twisted/web2/dav/element/rfc3744.py (revision 22891)
+++ twisted/web2/dav/element/rfc3744.py (working copy)
@@ -131,8 +131,8 @@
(dav_namespace, "self" ): (0, 1),
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.http.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/http.py
===================================================================
---- twisted/web2/dav/http.py (revision 19773)
+--- twisted/web2/dav/http.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.idav.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/idav.py
===================================================================
---- twisted/web2/dav/idav.py (revision 19773)
+--- twisted/web2/dav/idav.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.__init__.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/__init__.py
===================================================================
---- twisted/web2/dav/method/__init__.py (revision 19773)
+--- twisted/web2/dav/method/__init__.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.copymove.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/copymove.py
===================================================================
---- twisted/web2/dav/method/copymove.py (revision 19773)
+--- twisted/web2/dav/method/copymove.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.delete.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/delete.py
===================================================================
---- twisted/web2/dav/method/delete.py (revision 19773)
+--- twisted/web2/dav/method/delete.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/propfind.py
===================================================================
---- twisted/web2/dav/method/propfind.py (revision 19773)
+--- twisted/web2/dav/method/propfind.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.put.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/put.py
===================================================================
---- twisted/web2/dav/method/put.py (revision 19773)
+--- twisted/web2/dav/method/put.py (revision 22891)
+++ twisted/web2/dav/method/put.py (working copy)
@@ -34,7 +34,7 @@
from twisted.web2 import responsecode
Modified: 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_match.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/report_principal_match.py
===================================================================
---- twisted/web2/dav/method/report_principal_match.py (revision 19773)
+--- 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 = []
Modified: 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.method.report_principal_property_search.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/method/report_principal_property_search.py
===================================================================
---- twisted/web2/dav/method/report_principal_property_search.py (revision 19773)
+--- 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
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.resource.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/resource.py
===================================================================
---- twisted/web2/dav/resource.py (revision 19773)
+--- twisted/web2/dav/resource.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.static.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/static.py
===================================================================
---- twisted/web2/dav/static.py (revision 19773)
+--- twisted/web2/dav/static.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_acl.py
===================================================================
---- twisted/web2/dav/test/test_acl.py (revision 19773)
+--- twisted/web2/dav/test/test_acl.py (revision 22891)
+++ twisted/web2/dav/test/test_acl.py (working copy)
@@ -30,6 +30,7 @@
from twisted.web2.auth import basic
@@ -9,8 +9,8 @@
+from twisted.web2.dav.resource import DAVPrincipalCollectionResource
from twisted.web2.dav.util import davXMLFromStream
from twisted.web2.dav.auth import TwistedPasswordProperty, IPrincipal, DavRealm, TwistedPropertyChecker, AuthenticationWrapper
-
-@@ -38,6 +39,22 @@
+ from twisted.web2.dav.fileop import rmdir
+@@ -39,6 +40,22 @@
from twisted.web2.dav.test.util import Site, serialize
from twisted.web2.dav.test.test_resource import TestResource, TestDAVPrincipalResource
@@ -33,32 +33,36 @@
class ACL(twisted.web2.dav.test.util.TestCase):
"""
RFC 3744 (WebDAV ACL) tests.
-@@ -46,8 +63,18 @@
- if not hasattr(self, "docroot"):
- self.docroot = self.mktemp()
- os.mkdir(self.docroot)
-- rootresource = self.resource_class(self.docroot)
+@@ -47,8 +64,22 @@
+ if not hasattr(self, "_docroot"):
+ docroot = self.mktemp()
+ os.mkdir(docroot)
+- rootresource = self.resource_class(docroot)
+ userResource = TestDAVPrincipalResource("/principals/users/user01")
+ userResource.writeDeadProperty(TwistedPasswordProperty("user01"))
+
+ principalCollection = TestPrincipalsCollection(
-+ "/principals/",
-+ children={"users": TestPrincipalsCollection(
-+ "/principals/users/",
-+ children={"user01": userResource})})
++ "/principals/", children={
++ "users": TestPrincipalsCollection(
++ "/principals/users/", children={
++ "user01": userResource
++ }
++ )
++ }
++ )
+
+ rootResource = self.resource_class(self.docroot, principalCollections=(principalCollection,))
+
portal = Portal(DavRealm())
portal.registerChecker(TwistedPropertyChecker())
-@@ -56,26 +83,14 @@
+@@ -57,26 +88,14 @@
loginInterfaces = (IPrincipal,)
self.site = Site(AuthenticationWrapper(
- rootresource,
-+ rootResource,
++ rootResource,
portal,
credentialFactories,
loginInterfaces
@@ -79,10 +83,10 @@
- davxml.PrincipalCollectionSet(davxml.HRef("/principals/"))
- )
-
- for name, acl in (
- ("none" , self.grant()),
- ("read" , self.grant(davxml.Read())),
-@@ -361,9 +376,7 @@
+ for name, acl in (
+ ("none" , self.grant()),
+ ("read" , self.grant(davxml.Read())),
+@@ -342,9 +361,7 @@
if method == "GET":
ok = responsecode.OK
elif method == "REPORT":
@@ -93,7 +97,7 @@
else:
raise AssertionError("We shouldn't be here. (method = %r)" % (method,))
-@@ -377,6 +390,9 @@
+@@ -358,6 +375,9 @@
path = os.path.join(self.docroot, name)
request = SimpleRequest(self.site, method, "/" + name)
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_prop.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_prop.py
===================================================================
---- twisted/web2/dav/test/test_prop.py (revision 19773)
+--- twisted/web2/dav/test/test_prop.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_resource.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,67 +1,60 @@
Index: twisted/web2/dav/test/test_resource.py
===================================================================
---- twisted/web2/dav/test/test_resource.py (revision 19773)
+--- twisted/web2/dav/test/test_resource.py (revision 22891)
+++ twisted/web2/dav/test/test_resource.py (working copy)
-@@ -192,13 +192,10 @@
- class AccessTests(TestCase):
- def setUp(self):
- gooduser = TestDAVPrincipalResource('/users/gooduser')
-+ gooduser.writeDeadProperty(TwistedPasswordProperty('goodpass'))
+@@ -204,8 +204,7 @@
+ gooduser = TestDAVPrincipalResource("/users/gooduser")
+
- gooduser.writeDeadProperty(
-- TwistedPasswordProperty.fromString('goodpass'))
--
- baduser = TestDAVPrincipalResource('/users/baduser')
-- baduser.writeDeadProperty(
-- TwistedPasswordProperty.fromString('badpass'))
-+ baduser.writeDeadProperty(TwistedPasswordProperty('badpass'))
+- TwistedPasswordProperty.fromString("goodpass"))
++ gooduser.writeDeadProperty(TwistedPasswordProperty.fromString("goodpass"))
- protected = TestResource('/protected')
- protected.setAccessControlList(davxml.ACL(
-@@ -282,7 +279,8 @@
- # Has auth; should allow
+ baduser = TestDAVPrincipalResource("/users/baduser")
+ baduser.writeDeadProperty(TwistedPasswordProperty.fromString("badpass"))
+@@ -290,7 +289,8 @@
+ # Has auth; should allow
request = SimpleRequest(site, "GET", "/")
- request.user = davxml.Principal(davxml.HRef("/users/d00d"))
+ request.authnUser = davxml.Principal(davxml.HRef("/users/d00d"))
+ request.authzUser = davxml.Principal(davxml.HRef("/users/d00d"))
- d = request.locateResource('/')
+ d = request.locateResource("/")
d.addCallback(_checkPrivileges)
d.addCallback(expectOK)
-@@ -301,6 +299,8 @@
-
+@@ -306,6 +306,8 @@
+ )
return self.checkSecurity(request)
+ test_authorize.todo = "Needs refactoring"
+
def test_badUsernameOrPassword(self):
- request = SimpleRequest(self.site, 'GET', '/protected')
-
-@@ -316,6 +316,8 @@
-
+ request = SimpleRequest(self.site, "GET", "/protected")
+ request.headers.setHeader(
+@@ -316,6 +318,8 @@
+ d.addCallback(self.assertErrorResponse, responsecode.UNAUTHORIZED)
return d
+ test_badUsernameOrPassword.todo = "Needs refactoring."
+
def test_lacksPrivileges(self):
- request = SimpleRequest(self.site, 'GET', '/protected')
+ request = SimpleRequest(self.site, "GET", "/protected")
+ request.headers.setHeader(
+@@ -345,11 +349,12 @@
+ )
+ )
-@@ -348,12 +350,12 @@
- davxml.Grant(davxml.Privilege(davxml.All())),
- davxml.Protected()))
-
- def __init__(self, uri=None, children=None):
+ def __init__(self, uri=None, children=None, principalCollections=()):
"""
@param uri: A string respresenting the URI of the given resource
@param children: a dictionary of names to Resources
"""
--
+ DAVResource.__init__(self, principalCollections=principalCollections)
self.children = children
self.uri = uri
-@@ -380,8 +382,8 @@
+@@ -375,8 +380,8 @@
return succeed(davPrivilegeSet)
def currentPrincipal(self, request):
@@ -72,31 +65,9 @@
else:
return davxml.Principal(davxml.Unauthenticated())
-@@ -399,18 +401,21 @@
-
- def accessControlList(self, request, **kwargs):
- return succeed(self.acl)
--
-
- class AuthAllResource (TestResource):
-- """Give Authenticated principals all privileges deny everything else
+@@ -413,3 +418,5 @@
"""
-+ Give Authenticated principals all privileges and deny everyone else.
-+ """
- acl = davxml.ACL(
- davxml.ACE(
- davxml.Principal(davxml.Authenticated()),
- davxml.Grant(davxml.Privilege(davxml.All())),
-- davxml.Protected()))
--
-+ davxml.Protected()
-+ )
-+ )
-
- class TestDAVPrincipalResource(DAVPrincipalResource, TestResource):
-- """Get deadProperties from TestResource
-- """
-+ # Get dead properties from TestResource
-+
+ Get deadProperties from TestResource
+ """
+ def principalURL(self):
+ return self.uri
Modified: 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.test.test_static.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/test/test_static.py
===================================================================
---- twisted/web2/dav/test/test_static.py (revision 19773)
+--- 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)
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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.util.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/util.py
===================================================================
---- twisted/web2/dav/util.py (revision 19773)
+--- twisted/web2/dav/util.py (revision 22891)
+++ 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-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.dav.xattrprops.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/dav/xattrprops.py
===================================================================
---- twisted/web2/dav/xattrprops.py (revision 19773)
+--- twisted/web2/dav/xattrprops.py (revision 22891)
+++ twisted/web2/dav/xattrprops.py (working copy)
@@ -33,12 +33,18 @@
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.http.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.http.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.http.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/http.py
===================================================================
---- twisted/web2/http.py (revision 19773)
+--- twisted/web2/http.py (revision 22891)
+++ twisted/web2/http.py (working copy)
@@ -26,7 +26,7 @@
from twisted.web2 import http_headers
@@ -11,20 +11,7 @@
defaultPortForScheme = {'http': 80, 'https':443, 'ftp':21}
-@@ -66,9 +66,9 @@
- object.
- @type codeOrResponse: C{int} or L{http.Response}
- """
-- Exception.__init__(self)
-- self.response = iweb.IResponse(codeOrResponse)
-- self.args = str(self.response)
-+ response = iweb.IResponse(codeOrResponse)
-+ Exception.__init__(self, str(response))
-+ self.response = response
-
- def __repr__(self):
- return "<%s %s>" % (self.__class__.__name__, self.response)
-@@ -408,9 +408,22 @@
+@@ -407,9 +407,22 @@
def _sendContinue(self):
self.chanRequest.writeIntermediateResponse(responsecode.CONTINUE)
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.log.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.log.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.log.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,6 +1,6 @@
Index: twisted/web2/log.py
===================================================================
---- twisted/web2/log.py (revision 19773)
+--- twisted/web2/log.py (revision 22891)
+++ twisted/web2/log.py (working copy)
@@ -88,7 +88,7 @@
class LogWrapperResource(resource.WrapperResource):
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.server.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.server.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.server.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,8 +1,8 @@
Index: twisted/web2/server.py
===================================================================
---- twisted/web2/server.py (revision 19773)
+--- twisted/web2/server.py (revision 22891)
+++ twisted/web2/server.py (working copy)
-@@ -26,6 +26,7 @@
+@@ -24,6 +24,7 @@
from twisted.web2 import http_headers
from twisted.web2.filter.range import rangefilter
from twisted.web2 import error
@@ -10,9 +10,9 @@
from twisted.web2 import version as web2_version
from twisted import __version__ as twisted_version
-@@ -143,6 +144,9 @@
+@@ -171,6 +172,9 @@
error.defaultErrorHandler, defaultHeadersFilter]
-
+
def __init__(self, *args, **kw):
+
+ self.initTime = time.time()
@@ -20,7 +20,7 @@
if kw.has_key('site'):
self.site = kw['site']
del kw['site']
-@@ -150,17 +154,32 @@
+@@ -178,17 +182,32 @@
self._initialprepath = kw['prepathuri']
del kw['prepathuri']
@@ -56,15 +56,15 @@
def unparseURL(self, scheme=None, host=None, port=None,
path=None, params=None, querystring=None, fragment=None):
-@@ -265,6 +284,7 @@
-
+@@ -293,6 +312,7 @@
+
d = defer.Deferred()
d.addCallback(self._getChild, self.site.resource, self.postpath)
+ d.addCallback(self._rememberResource, "/" + "/".join(quote(s) for s in self.postpath))
d.addCallback(lambda res, req: res.renderHTTP(req), self)
d.addCallback(self._cbFinishRender)
d.addErrback(self._processingFailed)
-@@ -321,7 +341,6 @@
+@@ -349,7 +369,6 @@
if newpath is StopTraversal:
# We need to rethink how to do this.
#if newres is res:
@@ -72,7 +72,7 @@
return res
#else:
# raise ValueError("locateChild must not return StopTraversal with a resource other than self.")
-@@ -337,7 +356,6 @@
+@@ -365,7 +384,6 @@
self.prepath.append(self.postpath.pop(0))
child = self._getChild(None, newres, newpath, updatepaths=updatepaths)
@@ -80,7 +80,7 @@
return child
-@@ -347,6 +365,7 @@
+@@ -375,6 +393,7 @@
"""
Remember the URL of a visited resource.
"""
@@ -88,7 +88,7 @@
self._urlsByResource[resource] = url
return resource
-@@ -386,7 +405,8 @@
+@@ -414,7 +433,8 @@
The contained response will have a status code of
L{responsecode.BAD_REQUEST}.
"""
@@ -98,7 +98,7 @@
#
# Parse the URL
-@@ -407,9 +427,13 @@
+@@ -435,9 +455,13 @@
"URL is not on this site (%s://%s/): %s" % (scheme, self.headers.getHeader("host"), url)
))
@@ -114,7 +114,7 @@
def notFound(f):
f.trap(http.HTTPError)
-@@ -417,7 +441,7 @@
+@@ -445,7 +469,7 @@
return f
return None
Modified: CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.test.test_http.patch
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.test.test_http.patch 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/lib-patches/Twisted/twisted.web2.test.test_http.patch 2008-03-17 23:46:18 UTC (rev 2233)
@@ -1,8 +1,8 @@
Index: twisted/web2/test/test_http.py
===================================================================
---- twisted/web2/test/test_http.py (revision 19773)
+--- twisted/web2/test/test_http.py (revision 22891)
+++ twisted/web2/test/test_http.py (working copy)
-@@ -1017,6 +1017,8 @@
+@@ -1014,6 +1014,8 @@
response = TestResponse()
if self.uri == "/error":
response.code=402
Modified: CalendarServer/branches/users/wsanchez/twisted-update/run
===================================================================
--- CalendarServer/branches/users/wsanchez/twisted-update/run 2008-03-17 23:13:34 UTC (rev 2232)
+++ CalendarServer/branches/users/wsanchez/twisted-update/run 2008-03-17 23:46:18 UTC (rev 2233)
@@ -529,8 +529,8 @@
proto="svn";
;;
esac;
-svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-acl-1608-4";
-svn_get "Twisted" "${twisted}" "${svn_uri}" 19773;
+svn_uri="${proto}://svn.twistedmatrix.com/svn/Twisted/branches/dav-take-two-3081-1";
+svn_get "Twisted" "${twisted}" "${svn_uri}" 22891;
# 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/346753a8/attachment-0001.html
More information about the calendarserver-changes
mailing list