[CalendarServer-changes] [7637] CalendarServer/branches/users/glyph/quota/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 20 12:39:18 PDT 2011
Revision: 7637
http://trac.macosforge.org/projects/calendarserver/changeset/7637
Author: glyph at apple.com
Date: 2011-06-20 12:39:17 -0700 (Mon, 20 Jun 2011)
Log Message:
-----------
Move quotaAllowedBytes to common implementations. For one thing, quotaUsedBytes is there, and for another, some CDT tests require this method be present on addressbook homes.
Modified Paths:
--------------
CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/file.py
CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/sql.py
CalendarServer/branches/users/glyph/quota/txdav/common/datastore/file.py
CalendarServer/branches/users/glyph/quota/txdav/common/datastore/sql.py
Modified: CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/file.py 2011-06-20 19:39:08 UTC (rev 7636)
+++ CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/file.py 2011-06-20 19:39:17 UTC (rev 7637)
@@ -93,10 +93,6 @@
self._childClass = Calendar
- def quotaAllowedBytes(self):
- return self._transaction.store().quota
-
-
createCalendarWithName = CommonHome.createChildWithName
removeCalendarWithName = CommonHome.removeChildWithName
Modified: CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/sql.py 2011-06-20 19:39:08 UTC (rev 7636)
+++ CalendarServer/branches/users/glyph/quota/txdav/caldav/datastore/sql.py 2011-06-20 19:39:17 UTC (rev 7637)
@@ -108,10 +108,6 @@
self._shares = SQLLegacyCalendarShares(self)
- def quotaAllowedBytes(self):
- return self._txn.store().quota
-
-
createCalendarWithName = CommonHome.createChildWithName
removeCalendarWithName = CommonHome.removeChildWithName
calendarWithName = CommonHome.childWithName
Modified: CalendarServer/branches/users/glyph/quota/txdav/common/datastore/file.py
===================================================================
--- CalendarServer/branches/users/glyph/quota/txdav/common/datastore/file.py 2011-06-20 19:39:08 UTC (rev 7636)
+++ CalendarServer/branches/users/glyph/quota/txdav/common/datastore/file.py 2011-06-20 19:39:17 UTC (rev 7637)
@@ -257,6 +257,10 @@
self._cachedChildren = {}
+ def quotaAllowedBytes(self):
+ return self._transaction.store().quota
+
+
@classmethod
def homeWithUID(cls, txn, uid, create=False, withNotifications=False):
Modified: CalendarServer/branches/users/glyph/quota/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/quota/txdav/common/datastore/sql.py 2011-06-20 19:39:08 UTC (rev 7636)
+++ CalendarServer/branches/users/glyph/quota/txdav/common/datastore/sql.py 2011-06-20 19:39:17 UTC (rev 7637)
@@ -528,6 +528,10 @@
self._revisionBindJoinTable["BIND:%s" % (key,)] = value
+ def quotaAllowedBytes(self):
+ return self._txn.store().quota
+
+
@classproperty
def _resourceIDFromOwnerQuery(cls): #@NoSelf
home = cls._homeSchema
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110620/fbb22f6a/attachment.html>
More information about the calendarserver-changes
mailing list