Revision: 3630 http://trac.macosforge.org/projects/calendarserver/changeset/3630 Author: cdaboo@apple.com Date: 2009-01-31 19:04:44 -0800 (Sat, 31 Jan 2009) Log Message: ----------- Merged forward from trunk. Modified Paths: -------------- CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twistedcaldav/mail.py Modified: CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twistedcaldav/mail.py =================================================================== --- CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twistedcaldav/mail.py 2009-02-01 03:03:25 UTC (rev 3629) +++ CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/twistedcaldav/mail.py 2009-02-01 03:04:44 UTC (rev 3630) @@ -1,5 +1,5 @@ ## -# Copyright (c) 2005-2008 Apple Inc. All rights reserved. +# Copyright (c) 2005-2009 Apple Inc. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ from twisted.web import resource, server, client from twisted.web2 import responsecode from twisted.web2.dav import davxml +from twisted.web2.dav.noneprops import NonePropertyStore from twisted.web2.http import Response, HTTPError from twisted.web2.http_headers import MimeType @@ -185,8 +186,10 @@ def isPseudoCalendarCollection(self): return False - def hasDeadProperty(self, name): - return False + def deadProperties(self): + if not hasattr(self, "_dead_properties"): + self._dead_properties = NonePropertyStore(self) + return self._dead_properties def etag(self): return None