[CalendarServer-changes] [7039] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Thu Feb 17 14:46:27 PST 2011
Revision: 7039
http://trac.macosforge.org/projects/calendarserver/changeset/7039
Author: wsanchez at apple.com
Date: 2011-02-17 14:46:22 -0800 (Thu, 17 Feb 2011)
Log Message:
-----------
IDataStoreResource is not a resource. Call it IDataStoreObject.
Modified Paths:
--------------
CalendarServer/trunk/txdav/base/datastore/file.py
CalendarServer/trunk/txdav/caldav/datastore/file.py
CalendarServer/trunk/txdav/caldav/datastore/sql.py
CalendarServer/trunk/txdav/caldav/icalendarstore.py
CalendarServer/trunk/txdav/carddav/datastore/file.py
CalendarServer/trunk/txdav/carddav/datastore/sql.py
CalendarServer/trunk/txdav/carddav/iaddressbookstore.py
CalendarServer/trunk/txdav/common/datastore/sql.py
CalendarServer/trunk/txdav/common/inotifications.py
CalendarServer/trunk/txdav/idav.py
Modified: CalendarServer/trunk/txdav/base/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/file.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/base/datastore/file.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -22,7 +22,7 @@
from twext.python.log import LoggingMixIn
from twext.enterprise.ienterprise import AlreadyFinishedError
-from txdav.idav import IDataStoreResource
+from txdav.idav import IDataStoreObject
from txdav.base.propertystore.base import PropertyName
from twext.web2.dav.element.rfc2518 import GETContentType
@@ -191,7 +191,7 @@
class FileMetaDataMixin(object):
- implements(IDataStoreResource)
+ implements(IDataStoreObject)
def name(self):
"""
Modified: CalendarServer/trunk/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/file.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/caldav/datastore/file.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -562,7 +562,7 @@
),
)
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
"""
The content type of Calendar objects is text/calendar.
Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -695,7 +695,7 @@
),
)
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
"""
The content type of Calendar objects is text/calendar.
@@ -887,7 +887,7 @@
yield home.notifyChanged()
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
return self._contentType
Modified: CalendarServer/trunk/txdav/caldav/icalendarstore.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/icalendarstore.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/caldav/icalendarstore.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -21,7 +21,7 @@
from txdav.common.icommondatastore import ICommonTransaction, \
IShareableCollection
-from txdav.idav import IDataStoreResource, IDataStore
+from txdav.idav import IDataStoreObject, IDataStore
from txdav.idav import INotifier
@@ -83,7 +83,7 @@
# Interfaces
#
-class ICalendarHome(INotifier, IDataStoreResource):
+class ICalendarHome(INotifier, IDataStoreObject):
"""
An L{ICalendarHome} is a collection of calendars which belongs to a
specific principal and contains the calendars which that principal has
@@ -186,7 +186,7 @@
-class ICalendar(INotifier, IShareableCollection, IDataStoreResource):
+class ICalendar(INotifier, IShareableCollection, IDataStoreObject):
"""
Calendar
@@ -313,7 +313,7 @@
-class ICalendarObject(IDataStoreResource):
+class ICalendarObject(IDataStoreObject):
"""
Calendar object
@@ -442,7 +442,7 @@
-class IAttachment(IDataStoreResource):
+class IAttachment(IDataStoreObject):
"""
Information associated with an attachment to a calendar object.
"""
Modified: CalendarServer/trunk/txdav/carddav/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/file.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/carddav/datastore/file.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -268,7 +268,7 @@
self._uid = self.component().resourceUID()
return self._uid
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
"""
The content type of Addressbook objects is text/x-vcard.
Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -272,7 +272,7 @@
vCardText = CommonObjectResource.text
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
"""
The content type of Addressbook objects is text/x-vcard.
Modified: CalendarServer/trunk/txdav/carddav/iaddressbookstore.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/iaddressbookstore.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/carddav/iaddressbookstore.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -22,7 +22,7 @@
from txdav.common.icommondatastore import ICommonTransaction,\
IShareableCollection
from txdav.idav import INotifier
-from txdav.idav import IDataStoreResource
+from txdav.idav import IDataStoreObject
__all__ = [
# Classes
@@ -54,7 +54,7 @@
# Interfaces
#
-class IAddressBookHome(INotifier, IDataStoreResource):
+class IAddressBookHome(INotifier, IDataStoreObject):
"""
AddressBook home
@@ -117,7 +117,7 @@
"""
-class IAddressBook(INotifier, IShareableCollection, IDataStoreResource):
+class IAddressBook(INotifier, IShareableCollection, IDataStoreObject):
"""
AddressBook
@@ -225,7 +225,7 @@
"""
-class IAddressBookObject(IDataStoreResource):
+class IAddressBookObject(IDataStoreObject):
"""
AddressBook object
Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -517,7 +517,7 @@
def name(self):
"""
- Implement L{IDataStoreResource.name} to return the uid.
+ Implement L{IDataStoreObject.name} to return the uid.
"""
return self.uid()
@@ -768,7 +768,7 @@
return self._propertyStore
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
"""
The content type of objects
@@ -1925,7 +1925,7 @@
raise NotImplementedError
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
raise NotImplementedError()
@@ -2255,7 +2255,7 @@
- # IDataStoreResource
+ # IDataStoreObject
def contentType(self):
raise NotImplementedError()
Modified: CalendarServer/trunk/txdav/common/inotifications.py
===================================================================
--- CalendarServer/trunk/txdav/common/inotifications.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/common/inotifications.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -19,7 +19,7 @@
"""
from zope.interface.interface import Interface
-from txdav.idav import IDataStoreResource
+from txdav.idav import IDataStoreObject
__all__ = [
@@ -134,7 +134,7 @@
"""
-class INotificationObject(IDataStoreResource):
+class INotificationObject(IDataStoreObject):
"""
Notification object
Modified: CalendarServer/trunk/txdav/idav.py
===================================================================
--- CalendarServer/trunk/txdav/idav.py 2011-02-17 22:25:42 UTC (rev 7038)
+++ CalendarServer/trunk/txdav/idav.py 2011-02-17 22:46:22 UTC (rev 7039)
@@ -1,5 +1,5 @@
##
-# Copyright (c) 2010 Apple Inc. All rights reserved.
+# Copyright (c) 2010-2011 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.
@@ -24,7 +24,9 @@
"IPropertyName",
"IPropertyStore",
"IDataStore",
- "IDataStoreResource",
+ "IDataStoreObject",
+ "ITransaction",
+ "INotifier",
]
from zope.interface import Attribute, Interface
@@ -39,8 +41,6 @@
Property store error.
"""
-
-
class PropertyChangeNotAllowedError(PropertyStoreError):
"""
Property cannot be edited.
@@ -51,7 +51,6 @@
-
#
# Interfaces
#
@@ -118,9 +117,9 @@
"""
-class IDataStoreResource(Interface):
+class IDataStoreObject(Interface):
"""
- An L{IDataStoreResource} are the objects stored in an L{IDataStore}.
+ An L{IDataStoreObject} are the objects stored in an L{IDataStore}.
"""
def name():
@@ -138,7 +137,6 @@
@rtype: L{MimeType}
"""
-
def md5():
"""
The MD5 hex digest of this object's content.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110217/6ebdcafa/attachment-0001.html>
More information about the calendarserver-changes
mailing list