[CalendarServer-changes] [5940] CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/ storebridge.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jul 26 12:44:16 PDT 2010
Revision: 5940
http://trac.macosforge.org/projects/calendarserver/changeset/5940
Author: glyph at apple.com
Date: 2010-07-26 12:44:16 -0700 (Mon, 26 Jul 2010)
Log Message:
-----------
'text' method required by metadata mixin
Modified Paths:
--------------
CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/storebridge.py
Modified: CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/storebridge.py 2010-07-26 19:42:54 UTC (rev 5939)
+++ CalendarServer/branches/new-store-no-caldavfile-2/twistedcaldav/storebridge.py 2010-07-26 19:44:16 UTC (rev 5940)
@@ -48,7 +48,7 @@
from twistedcaldav.caldavxml import ScheduleTag, caldav_namespace
from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError
-from twistedcaldav.notifications import NotificationCollectionResource,\
+from twistedcaldav.notifications import NotificationCollectionResource, \
NotificationResource
from twistedcaldav.resource import CalDAVResource, GlobalAddressBookResource
from twistedcaldav.schedule import ScheduleInboxResource
@@ -154,6 +154,7 @@
return wrap
+
class _NewStoreFileMetaDataHelper(object):
def name(self):
@@ -195,6 +196,8 @@
def newStoreProperties(self):
return self._newStoreObject.properties()
+
+
class _CalendarChildHelper(object):
"""
Methods for things which are like calendars.
@@ -730,7 +733,7 @@
# Is this a sharee's view of a shared calendar? If so, they can't do
# scheduling onto it, so just delete it and move on.
- isVirtual =self.isVirtualShare()
+ isVirtual = self.isVirtualShare()
if isVirtual:
log.debug("Removing shared calendar %s" % (self,))
yield self.removeVirtualShare(request)
@@ -973,6 +976,10 @@
return self._newStoreObject.iCalendarText()
+ def text(self):
+ return self.iCalendarText()
+
+
@requiresPermissions(fromParent=[davxml.Unbind()])
def http_DELETE(self, request):
"""
@@ -1801,14 +1808,14 @@
return True
def addNotification(self, request, uid, xmltype, xmldata):
-
+
self._newStoreNotifications.writeNotificationObject(uid, xmltype, xmldata)
return succeed(None)
def deleteNotification(self, request, record):
self._newStoreNotifications.removeNotificationObjectWithName(record.name)
return succeed(None)
-
+
class StoreProtoNotificationCollectionResource(NotificationCollectionResource):
"""
A resource representing a notification collection which hasn't yet been created.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100726/89a01a99/attachment-0001.html>
More information about the calendarserver-changes
mailing list