[CalendarServer-changes] [2886] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Aug 26 21:06:53 PDT 2008
Revision: 2886
http://trac.macosforge.org/projects/calendarserver/changeset/2886
Author: cdaboo at apple.com
Date: 2008-08-26 21:06:52 -0700 (Tue, 26 Aug 2008)
Log Message:
-----------
Clean up a bunch of package __all__ imports.
Modified Paths:
--------------
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.auth.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.element.base.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.http.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.idav.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.util.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch
CalendarServer/trunk/twistedcaldav/authkerb.py
CalendarServer/trunk/twistedcaldav/customxml.py
CalendarServer/trunk/twistedcaldav/dateops.py
CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
CalendarServer/trunk/twistedcaldav/directory/principal.py
CalendarServer/trunk/twistedcaldav/directory/util.py
CalendarServer/trunk/twistedcaldav/extensions.py
CalendarServer/trunk/twistedcaldav/ical.py
CalendarServer/trunk/twistedcaldav/icaldav.py
CalendarServer/trunk/twistedcaldav/index.py
CalendarServer/trunk/twistedcaldav/log.py
CalendarServer/trunk/twistedcaldav/method/report_common.py
CalendarServer/trunk/twistedcaldav/query/calendarquery.py
CalendarServer/trunk/twistedcaldav/query/expression.py
CalendarServer/trunk/twistedcaldav/scheduling/__init__.py
CalendarServer/trunk/twistedcaldav/scheduling/addressmapping.py
CalendarServer/trunk/twistedcaldav/scheduling/itip.py
CalendarServer/trunk/twistedcaldav/scheduling/processing.py
CalendarServer/trunk/twistedcaldav/sql.py
CalendarServer/trunk/twistedcaldav/static.py
CalendarServer/trunk/twistedcaldav/timezones.py
CalendarServer/trunk/twistedcaldav/timezoneservice.py
Added Paths:
-----------
CalendarServer/trunk/lib-patches/Twisted/twisted.internet.defer.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.fileop.patch
CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.report.patch
Added: CalendarServer/trunk/lib-patches/Twisted/twisted.internet.defer.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.internet.defer.patch (rev 0)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.internet.defer.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -0,0 +1,12 @@
+Index: twisted/internet/defer.py
+===================================================================
+--- twisted/internet/defer.py (revision 19773)
++++ twisted/internet/defer.py (working copy)
+@@ -998,6 +998,6 @@
+ __all__ = ["Deferred", "DeferredList", "succeed", "fail", "FAILURE", "SUCCESS",
+ "AlreadyCalledError", "TimeoutError", "gatherResults",
+ "maybeDeferred",
+- "waitForDeferred", "deferredGenerator", "inlineCallbacks",
++ "waitForDeferred", "deferredGenerator", "returnValue", "inlineCallbacks",
+ "DeferredLock", "DeferredSemaphore", "DeferredQueue",
+ ]
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.auth.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.auth.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.auth.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,8 +2,23 @@
===================================================================
--- twisted/web2/dav/auth.py (revision 19773)
+++ twisted/web2/dav/auth.py (working copy)
-@@ -40,7 +40,7 @@
+@@ -5,7 +5,13 @@
+ from twisted.web2.dav import davxml
+ from twisted.web2.dav.davxml import twisted_private_namespace
+-__all__ = ["PrincipalCredentials", "AuthenticationWrapper"]
++__all__ = [
++ "IPrincipal",
++ "DavRealm",
++ "IPrincipalCredentials",
++ "PrincipalCredentials",
++ "AuthenticationWrapper",
++]
+
+ class AuthenticationWrapper(WrapperResource):
+ def __init__(self, resource, portal, credentialFactories, loginInterfaces):
+@@ -40,7 +46,7 @@
+
def requestAvatar(self, avatarId, mind, *interfaces):
if IPrincipal in interfaces:
- return IPrincipal, davxml.Principal(davxml.HRef(avatarId))
@@ -11,7 +26,7 @@
raise NotImplementedError("Only IPrincipal interface is supported")
-@@ -52,33 +52,44 @@
+@@ -52,33 +58,44 @@
class PrincipalCredentials(object):
implements(IPrincipalCredentials)
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.element.base.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.element.base.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -248,3 +248,20 @@
class WebDAVEmptyElement (WebDAVElement):
"""
WebDAV element with no contents.
+@@ -388,6 +526,7 @@
+ """
+ WebDAV element containing PCDATA.
+ """
++ @classmethod
+ def fromString(clazz, string):
+ if string is None:
+ return clazz()
+@@ -396,8 +535,6 @@
+ else:
+ return clazz(PCDATAElement(str(string)))
+
+- fromString = classmethod(fromString)
+-
+ allowed_children = { PCDATAElement: (0, None) }
+
+ def __str__(self):
Added: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.fileop.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.fileop.patch (rev 0)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.fileop.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -0,0 +1,12 @@
+Index: twisted/web2/dav/fileop.py
+===================================================================
+--- twisted/web2/dav/fileop.py (revision 19773)
++++ twisted/web2/dav/fileop.py (working copy)
+@@ -35,6 +35,7 @@
+ "move",
+ "put",
+ "mkcollection",
++ "rmdir",
+ ]
+
+ import os
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.http.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.http.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.http.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,7 +2,21 @@
===================================================================
--- twisted/web2/dav/http.py (revision 19773)
+++ twisted/web2/dav/http.py (working copy)
-@@ -69,10 +69,9 @@
+@@ -28,10 +28,13 @@
+
+ __all__ = [
+ "ErrorResponse",
++ "NeedPrivilegesResponse",
+ "MultiStatusResponse",
+ "ResponseQueue",
+ "PropertyStatusResponseQueue",
+ "statusForFailure",
++ "errorForFailure",
++ "messageForFailure",
+ ]
+
+ import errno
+@@ -69,10 +72,9 @@
"""
if type(error) is tuple:
xml_namespace, xml_name = error
@@ -16,7 +30,7 @@
output = davxml.Error(error).toxml()
-@@ -227,7 +226,7 @@
+@@ -227,7 +229,7 @@
if len(property.children) > 0:
# Re-instantiate as empty element.
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.idav.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.idav.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.idav.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,6 +2,15 @@
===================================================================
--- twisted/web2/dav/idav.py (revision 19773)
+++ twisted/web2/dav/idav.py (working copy)
+@@ -26,7 +26,7 @@
+ web2.dav interfaces.
+ """
+
+-__all__ = [ "IDAVResource", "IDAVPrincipalResource" ]
++__all__ = [ "IDAVResource", "IDAVPrincipalResource", "IDAVPrincipalCollectionResource", ]
+
+ from twisted.web2.iweb import IResource
+
@@ -41,7 +41,7 @@
otherwise.
"""
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.propfind.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,8 +2,20 @@
===================================================================
--- twisted/web2/dav/method/propfind.py (revision 19773)
+++ twisted/web2/dav/method/propfind.py (working copy)
-@@ -200,7 +200,7 @@
+@@ -27,7 +27,10 @@
+ WebDAV PROPFIND method
+ """
+-__all__ = ["http_PROPFIND"]
++__all__ = [
++ "http_PROPFIND",
++ "propertyName",
++]
+
+ from twisted.python import log
+ from twisted.python.failure import Failure
+@@ -200,7 +203,7 @@
+
def propertyName(name):
property_namespace, property_name = name
- class PropertyName (davxml.WebDAVEmptyElement):
Added: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.report.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.report.patch (rev 0)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.method.report.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -0,0 +1,17 @@
+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
+
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.resource.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,7 +2,19 @@
===================================================================
--- twisted/web2/dav/resource.py (revision 19773)
+++ twisted/web2/dav/resource.py (working copy)
-@@ -40,10 +40,16 @@
+@@ -31,19 +31,28 @@
+ "DAVResource",
+ "DAVLeafResource",
+ "DAVPrincipalResource",
++ "DAVPrincipalCollectionResource",
+ "AccessDeniedError",
+ "isPrincipalResource",
+ "TwistedACLInheritable",
++ "TwistedGETContentMD5",
++ "TwistedQuotaRootProperty",
+ "allACL",
+ "readonlyACL",
+ "davPrivilegeSet",
"unauthenticatedPrincipal",
]
@@ -20,7 +32,7 @@
from twisted.internet.defer import Deferred, maybeDeferred, succeed
from twisted.internet.defer import waitForDeferred, deferredGenerator
from twisted.internet import reactor
-@@ -52,12 +58,13 @@
+@@ -52,12 +61,13 @@
from twisted.web2.http_headers import generateContentType
from twisted.web2.iweb import IResponse
from twisted.web2.resource import LeafResource
@@ -35,7 +47,7 @@
from twisted.web2.dav.http import NeedPrivilegesResponse
from twisted.web2.dav.noneprops import NonePropertyStore
from twisted.web2.dav.util import unimplemented, parentForURL, joinURL
-@@ -126,10 +133,13 @@
+@@ -126,10 +136,13 @@
#(dav_namespace, "group" ), # RFC 3744, section 5.2
(dav_namespace, "supported-privilege-set" ), # RFC 3744, section 5.3
(dav_namespace, "current-user-privilege-set"), # RFC 3744, section 5.4
@@ -49,7 +61,7 @@
(twisted_dav_namespace, "resource-class"),
)
-@@ -166,6 +176,14 @@
+@@ -166,6 +179,14 @@
if qname[0] == twisted_private_namespace:
return succeed(False)
@@ -64,7 +76,7 @@
return succeed(qname in self.liveProperties or self.deadProperties().contains(qname))
def readProperty(self, property, request):
-@@ -239,8 +257,10 @@
+@@ -239,8 +260,10 @@
)
if name == "supported-report-set":
@@ -77,7 +89,7 @@
if name == "supported-privilege-set":
return self.supportedPrivileges(request)
-@@ -252,9 +272,10 @@
+@@ -252,9 +275,10 @@
return davxml.InheritedACLSet(*self.inheritedACLSet())
if name == "principal-collection-set":
@@ -91,7 +103,7 @@
def ifAllowed(privileges, callback):
def onError(failure):
-@@ -286,7 +307,36 @@
+@@ -286,7 +310,36 @@
d.addCallback(gotACL)
return d
return ifAllowed((davxml.ReadACL(),), callback)
@@ -128,7 +140,7 @@
elif namespace == twisted_dav_namespace:
if name == "resource-class":
class ResourceClass (davxml.WebDAVTextElement):
-@@ -363,15 +413,28 @@
+@@ -363,15 +416,28 @@
"""
See L{IDAVResource.listProperties}.
"""
@@ -161,7 +173,7 @@
def listAllprop(self, request):
"""
Some DAV properties should not be returned to a C{DAV:allprop} query.
-@@ -465,8 +528,22 @@
+@@ -465,8 +531,22 @@
return super(DAVPropertyMixIn, self).displayName()
class DAVResource (DAVPropertyMixIn, StaticRenderMixin):
@@ -184,7 +196,7 @@
##
# DAV
##
-@@ -570,19 +647,21 @@
+@@ -570,19 +650,21 @@
See L{IDAVResource.authorize}.
"""
def onError(failure):
@@ -211,7 +223,7 @@
response = UnauthorizedResponse(request.credentialFactories,
request.remoteAddr)
else:
-@@ -593,7 +672,7 @@
+@@ -593,7 +675,7 @@
# class is supposed to be a FORBIDDEN status code and
# "Authorization will not help" according to RFC2616
#
@@ -220,7 +232,7 @@
d = self.checkPrivileges(request, privileges, recurse)
d.addErrback(onErrors)
-@@ -606,16 +685,21 @@
+@@ -606,16 +688,21 @@
def authenticate(self, request):
def loginSuccess(result):
@@ -246,7 +258,7 @@
authHeader = request.headers.getHeader('authorization')
-@@ -631,9 +715,10 @@
+@@ -631,9 +718,10 @@
# Try to match principals in each principal collection on the resource
def gotDetails(details):
@@ -260,7 +272,7 @@
def login(pcreds):
d = request.portal.login(pcreds, None, *request.loginInterfaces)
-@@ -641,13 +726,15 @@
+@@ -641,13 +729,15 @@
return d
@@ -280,7 +292,7 @@
##
# ACL
-@@ -656,49 +743,23 @@
+@@ -656,49 +746,23 @@
def currentPrincipal(self, request):
"""
@param request: the request being processed.
@@ -339,7 +351,7 @@
"""
@return: the L{davxml.ACL} element containing the default access control
list for this resource.
-@@ -710,6 +771,17 @@
+@@ -710,6 +774,17 @@
#
return readonlyACL
@@ -357,7 +369,7 @@
def setAccessControlList(self, acl):
"""
See L{IDAVResource.setAccessControlList}.
-@@ -748,13 +820,16 @@
+@@ -748,13 +823,16 @@
# 10. Verify that new acl is not in conflict with itself
# 11. Update acl on the resource
@@ -375,7 +387,7 @@
# Need to get list of supported privileges
supported = []
-@@ -1038,9 +1113,9 @@
+@@ -1038,9 +1116,9 @@
if myURL == "/":
# If we get to the root without any ACLs, then use the default.
@@ -387,7 +399,7 @@
# Dynamically update privileges for those ace's that are inherited.
if inheritance:
-@@ -1076,7 +1151,7 @@
+@@ -1076,7 +1154,7 @@
# Adjust ACE for inherit on this resource
children = list(ace.children)
children.remove(TwistedACLInheritable())
@@ -396,7 +408,7 @@
aces.append(davxml.ACE(*children))
else:
aces.extend(inherited_aces)
-@@ -1105,8 +1180,7 @@
+@@ -1105,8 +1183,7 @@
the child resource loop and supply those to the checkPrivileges on each child.
@param request: the L{IRequest} for the request in progress.
@@ -406,7 +418,7 @@
"""
# Get the parent ACLs with inheritance and preserve the <inheritable> element.
-@@ -1128,21 +1202,9 @@
+@@ -1128,21 +1205,9 @@
# Adjust ACE for inherit on this resource
children = list(ace.children)
children.remove(TwistedACLInheritable())
@@ -430,7 +442,7 @@
inheritedACEsforChildren = deferredGenerator(inheritedACEsforChildren)
-@@ -1152,49 +1214,69 @@
+@@ -1152,49 +1217,69 @@
This implementation returns an empty set.
"""
@@ -528,7 +540,7 @@
def samePrincipal(self, principal1, principal2):
"""
Check whether the two prinicpals are exactly the same in terms of
-@@ -1219,7 +1301,6 @@
+@@ -1219,7 +1304,6 @@
return False
def matchPrincipal(self, principal1, principal2, request):
@@ -536,7 +548,7 @@
"""
Check whether the principal1 is a principal in the set defined by
principal2.
-@@ -1244,6 +1325,9 @@
+@@ -1244,6 +1328,9 @@
if isinstance(principal1, davxml.Unauthenticated):
yield False
return
@@ -546,7 +558,7 @@
else:
yield True
return
-@@ -1271,7 +1355,6 @@
+@@ -1271,7 +1358,6 @@
assert principal2 is not None, "principal2 is None"
@@ -554,7 +566,7 @@
# Compare two HRefs and do group membership test as well
if principal1 == principal2:
yield True
-@@ -1289,6 +1372,7 @@
+@@ -1289,6 +1375,7 @@
matchPrincipal = deferredGenerator(matchPrincipal)
@@ -562,7 +574,7 @@
def principalIsGroupMember(self, principal1, principal2, request):
"""
Check whether one principal is a group member of another.
-@@ -1299,18 +1383,21 @@
+@@ -1299,18 +1386,21 @@
@return: L{Deferred} with result C{True} if principal1 is a member of principal2, C{False} otherwise
"""
@@ -595,7 +607,7 @@
def validPrincipal(self, ace_principal, request):
"""
-@@ -1351,11 +1438,16 @@
+@@ -1351,11 +1441,16 @@
@return C{True} if C{href_principal} is valid, C{False} otherwise.
This implementation tests for a href element that corresponds to
@@ -615,7 +627,7 @@
return d
def resolvePrincipal(self, principal, request):
-@@ -1432,7 +1524,7 @@
+@@ -1432,7 +1527,7 @@
log.err("DAV:self ACE is set on non-principal resource %r" % (self,))
yield None
return
@@ -624,7 +636,7 @@
if isinstance(principal, davxml.HRef):
yield principal
-@@ -1517,6 +1609,270 @@
+@@ -1517,6 +1612,270 @@
return None
##
@@ -895,7 +907,7 @@
# HTTP
##
-@@ -1525,15 +1881,11 @@
+@@ -1525,15 +1884,11 @@
#litmus = request.headers.getRawHeaders("x-litmus")
#if litmus: log.msg("*** Litmus test: %s ***" % (litmus,))
@@ -913,7 +925,7 @@
def setHeaders(response):
response = IResponse(response)
-@@ -1567,7 +1919,7 @@
+@@ -1567,7 +1922,7 @@
def findChildren(self, depth, request, callback, privileges=None, inherited_aces=None):
return succeed(None)
@@ -922,7 +934,7 @@
"""
Resource representing a WebDAV principal. (RFC 3744, section 2)
"""
-@@ -1577,7 +1929,7 @@
+@@ -1577,7 +1932,7 @@
# WebDAV
##
@@ -931,7 +943,7 @@
(dav_namespace, "alternate-URI-set"),
(dav_namespace, "principal-URL" ),
(dav_namespace, "group-member-set" ),
-@@ -1585,14 +1937,11 @@
+@@ -1585,14 +1940,11 @@
)
def davComplianceClasses(self):
@@ -947,7 +959,7 @@
def readProperty(self, property, request):
def defer():
if type(property) is tuple:
-@@ -1610,10 +1959,20 @@
+@@ -1610,10 +1962,20 @@
return davxml.PrincipalURL(davxml.HRef(self.principalURL()))
if name == "group-member-set":
@@ -970,7 +982,7 @@
if name == "resourcetype":
if self.isCollection():
-@@ -1655,7 +2014,7 @@
+@@ -1655,7 +2017,7 @@
principals. Subclasses should override this method to provide member
URLs for this resource if appropriate.
"""
@@ -979,7 +991,7 @@
def groupMemberships(self):
"""
-@@ -1666,6 +2025,7 @@
+@@ -1666,6 +2028,7 @@
"""
unimplemented(self)
@@ -987,7 +999,7 @@
def principalMatch(self, href):
"""
Check whether the supplied principal matches this principal or is a
-@@ -1675,10 +2035,33 @@
+@@ -1675,10 +2038,33 @@
"""
uri = str(href)
if self.principalURL() == uri:
@@ -1023,7 +1035,7 @@
class AccessDeniedError(Exception):
def __init__(self, errors):
"""
-@@ -1718,6 +2101,37 @@
+@@ -1718,6 +2104,37 @@
davxml.registerElement(TwistedACLInheritable)
davxml.ACE.allowed_children[(twisted_dav_namespace, "inheritable")] = (0, 1)
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.util.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.util.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.util.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -2,8 +2,16 @@
===================================================================
--- twisted/web2/dav/util.py (revision 19773)
+++ twisted/web2/dav/util.py (working copy)
-@@ -76,7 +76,9 @@
+@@ -37,6 +37,7 @@
+ "normalizeURL",
+ "joinURL",
+ "parentForURL",
++ "unimplemented",
+ "bindMethods",
+ ]
+@@ -76,7 +77,9 @@
+
def parse(xml):
try:
- return davxml.WebDAVDocument.fromString(xml)
Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch
===================================================================
--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.http.patch 2008-08-27 04:06:52 UTC (rev 2886)
@@ -48,3 +48,10 @@
def _error(self, reason):
if reason.check(error.ConnectionLost):
+@@ -471,5 +484,5 @@
+ else:
+ components.registerAdapter(compat.OldResourceAdapter, resource.IResource, iweb.IOldNevowResource)
+
+-__all__ = ['HTTPError', 'NotModifiedResponse', 'Request', 'Response', 'checkIfRange', 'checkPreconditions', 'defaultPortForScheme', 'parseVersion', 'splitHostPort']
++__all__ = ['HTTPError', 'NotModifiedResponse', 'Request', 'Response', 'StatusResponse', 'RedirectResponse', 'checkIfRange', 'checkPreconditions', 'defaultPortForScheme', 'parseVersion', 'splitHostPort']
+
Modified: CalendarServer/trunk/twistedcaldav/authkerb.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/authkerb.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/authkerb.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -29,10 +29,10 @@
__all__ = [
"BasicKerberosCredentials",
- "BasicKerberosAuthorizer",
+ "BasicKerberosCredentialFactory",
"BasicKerberosCredentialsChecker",
"NegotiateCredentials",
- "NegotiateAuthorizer",
+ "NegotiateCredentialFactory",
"NegotiateCredentialsChecker",
]
Modified: CalendarServer/trunk/twistedcaldav/customxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/customxml.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/customxml.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -23,7 +23,7 @@
change.
"""
-from twisted.web2.dav.resource import twisted_dav_namespace
+from twisted.web2.dav.davxml import twisted_dav_namespace
from twisted.web2.dav import davxml
from twistedcaldav.ical import Component as iComponent
Modified: CalendarServer/trunk/twistedcaldav/dateops.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/dateops.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/dateops.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -21,6 +21,7 @@
__all__ = [
"normalizeToUTC",
"normalizeForIndex",
+ "floatoffset",
"compareDateTime",
"differenceDateTime",
"makeComparableDateTime",
Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -20,6 +20,7 @@
__all__ = [
"CalendarUserProxyPrincipalResource",
+ "CalendarUserProxyDatabase",
]
from twisted.internet.defer import returnValue
Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -25,6 +25,9 @@
"DirectoryPrincipalUIDProvisioningResource",
"DirectoryPrincipalResource",
"DirectoryCalendarPrincipalResource",
+ "format_list",
+ "format_principals",
+ "format_link",
]
from cgi import escape
Modified: CalendarServer/trunk/twistedcaldav/directory/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/util.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/directory/util.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -20,6 +20,7 @@
__all__ = [
"uuidFromName",
+ "NotFilePath",
]
from sha import sha
Modified: CalendarServer/trunk/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/extensions.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/extensions.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -26,6 +26,7 @@
"ReadOnlyWritePropertiesResourceMixIn",
"ReadOnlyResourceMixIn",
"XMLResponse",
+ "CachingXattrPropertyStore",
]
import cPickle as pickle
@@ -37,12 +38,12 @@
from twisted.internet.defer import maybeDeferred
from twisted.web2 import responsecode
from twisted.web2.http import HTTPError, Response, RedirectResponse
+from twisted.web2.http import StatusResponse
from twisted.web2.http_headers import MimeType
from twisted.web2.stream import FileStream
from twisted.web2.static import MetaDataMixin
from twisted.web2.dav import davxml
from twisted.web2.dav.davxml import dav_namespace
-from twisted.web2.dav.http import StatusResponse
from twisted.web2.dav.static import DAVFile as SuperDAVFile
from twisted.web2.dav.resource import DAVResource as SuperDAVResource
from twisted.web2.dav.resource import DAVPrincipalResource as SuperDAVPrincipalResource
Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -19,6 +19,8 @@
"""
__all__ = [
+ "iCalendarProductID",
+ "allowedComponents",
"Property",
"Component",
"FixedOffset",
@@ -27,6 +29,7 @@
"parse_datetime",
"parse_date_or_datetime",
"parse_duration",
+ "tzexpand",
]
from twisted.web2.dav.util import allDataFromStream
Modified: CalendarServer/trunk/twistedcaldav/icaldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/icaldav.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/icaldav.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -18,7 +18,10 @@
CalDAV interfaces.
"""
-__all__ = [ "IDAVResource" ]
+__all__ = [
+ "ICalDAVResource",
+ "ICalendarPrincipalResource",
+]
from twisted.web2.dav.idav import IDAVResource
Modified: CalendarServer/trunk/twistedcaldav/index.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/index.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/index.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -22,6 +22,9 @@
"""
__all__ = [
+ "db_basename",
+ "ReservationError",
+ "MemcachedUIDReserver",
"Index",
"IndexSchedule",
]
Modified: CalendarServer/trunk/twistedcaldav/log.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/log.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/log.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -51,8 +51,10 @@
"logLevelForNamespace",
"setLogLevelForNamespace",
"clearLogLevels",
+ "logLevelsByNamespace",
"Logger",
"LoggingMixIn",
+ "InvalidLogLevelError",
]
import inspect
Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -20,9 +20,11 @@
"allPropertiesForResource",
"propertyNamesForResource",
"propertyListForResource",
+ "validPropertyListCalendarDataTypeVersion",
"generateFreeBusyInfo",
"processEventFreeBusy",
"processFreeBusyFreeBusy",
+ "processAvailabilityFreeBusy",
"buildFreeBusyResult",
]
Modified: CalendarServer/trunk/twistedcaldav/query/calendarquery.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/query/calendarquery.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/query/calendarquery.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -44,7 +44,7 @@
"""
Convert the supplied calendar-query into an expression tree.
- @param filter: the L{Filter} for thw calendar-query to convert.
+ @param filter: the L{Filter} for the calendar-query to convert.
@return: a L{baseExpression} for the expression tree.
"""
Modified: CalendarServer/trunk/twistedcaldav/query/expression.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/query/expression.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/query/expression.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -22,11 +22,14 @@
__version__ = "0.0"
__all__ = [
+ "allExpression",
"notExpression",
"andExpression",
"orExpression",
"timerangeExpression",
+ "textcompareExpression",
"containsExpression",
+ "notcontainsExpression",
"isExpression",
"isnotExpression",
"inExpression",
Modified: CalendarServer/trunk/twistedcaldav/scheduling/__init__.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/__init__.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/scheduling/__init__.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -22,5 +22,6 @@
"imip",
"implicit",
"ischedule",
+ "processing",
"scheduler",
]
Modified: CalendarServer/trunk/twistedcaldav/scheduling/addressmapping.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/addressmapping.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/scheduling/addressmapping.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -27,6 +27,7 @@
__all__ = [
"ScheduleAddressMapper",
+ "mapper",
]
log = Logger()
Modified: CalendarServer/trunk/twistedcaldav/scheduling/itip.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/itip.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/scheduling/itip.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -42,7 +42,7 @@
__version__ = "0.0"
__all__ = [
- "iTipProcessor",
+ "iTipProcessing",
"iTipGenerator",
]
Modified: CalendarServer/trunk/twistedcaldav/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/processing.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/scheduling/processing.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -26,6 +26,7 @@
__all__ = [
"ImplicitProcessor",
+ "ImplicitProcessorException",
]
log = Logger()
Modified: CalendarServer/trunk/twistedcaldav/sql.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/sql.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/sql.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -20,6 +20,7 @@
__all__ = [
"AbstractSQLDatabase",
+ "db_prefix"
]
import os
Modified: CalendarServer/trunk/twistedcaldav/static.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/static.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/static.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -27,6 +27,7 @@
"ScheduleFile",
"ScheduleInboxFile",
"ScheduleOutboxFile",
+ "IScheduleInboxFile",
"DropBoxHomeFile",
"DropBoxCollectionFile",
"DropBoxChildFile",
Modified: CalendarServer/trunk/twistedcaldav/timezones.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezones.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/timezones.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -43,6 +43,8 @@
__all__ = [
"TimezoneException",
"TimezoneCache",
+ "readTZ",
+ "listTZs",
]
class TimezoneException(Exception):
Modified: CalendarServer/trunk/twistedcaldav/timezoneservice.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/timezoneservice.py 2008-08-27 02:28:20 UTC (rev 2885)
+++ CalendarServer/trunk/twistedcaldav/timezoneservice.py 2008-08-27 04:06:52 UTC (rev 2886)
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
-from twistedcaldav.ical import tzexpand
"""
Timezone service resource and operations.
@@ -35,6 +34,7 @@
from twistedcaldav.customxml import calendarserver_namespace
from twistedcaldav.extensions import XMLResponse
from twistedcaldav.ical import parse_date_or_datetime
+from twistedcaldav.ical import tzexpand
from twistedcaldav.resource import CalDAVResource
from twistedcaldav.timezones import TimezoneException
from twistedcaldav.timezones import listTZs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080826/cac8ddca/attachment-0001.html
More information about the calendarserver-changes
mailing list