[CalendarServer-changes] [5802] CalendarServer/branches/new-store

source_changes at macosforge.org source_changes at macosforge.org
Tue Jun 22 14:44:11 PDT 2010


Revision: 5802
          http://trac.macosforge.org/projects/calendarserver/changeset/5802
Author:   cdaboo at apple.com
Date:     2010-06-22 14:44:10 -0700 (Tue, 22 Jun 2010)
Log Message:
-----------
Clean up private attribute access.

Modified Paths:
--------------
    CalendarServer/branches/new-store/twistedcaldav/storebridge.py
    CalendarServer/branches/new-store/txdav/datastore/file.py

Modified: CalendarServer/branches/new-store/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/new-store/twistedcaldav/storebridge.py	2010-06-22 21:43:42 UTC (rev 5801)
+++ CalendarServer/branches/new-store/twistedcaldav/storebridge.py	2010-06-22 21:44:10 UTC (rev 5802)
@@ -521,7 +521,7 @@
         objectName = self._newStoreObject.name()
         calendarName = self._newStoreObject._calendar.name()
         homeUID = self._newStoreObject._calendar._calendarHome.uid()
-        store = self._newStoreObject._transaction._dataStore
+        store = self._newStoreObject._transaction.store()
         txn = store.newTransaction()
         newObject = (txn.calendarHomeWithUID(homeUID)
                         .calendarWithName(calendarName)
@@ -1106,7 +1106,7 @@
         objectName = self._newStoreObject.name()
         Name = self._newStoreObject._addressbook.name()
         homeUID = self._newStoreObject._addressbook._addressbookHome.uid()
-        store = self._newStoreObject._transaction._addressbookStore
+        store = self._newStoreObject._transaction.store()
         txn = store.newTransaction()
         newObject = (txn.HomeWithUID(homeUID)
                         .addressbookWithName(Name)

Modified: CalendarServer/branches/new-store/txdav/datastore/file.py
===================================================================
--- CalendarServer/branches/new-store/txdav/datastore/file.py	2010-06-22 21:43:42 UTC (rev 5801)
+++ CalendarServer/branches/new-store/txdav/datastore/file.py	2010-06-22 21:44:10 UTC (rev 5802)
@@ -144,6 +144,9 @@
         self._tracker = _CommitTracker()
 
 
+    def store(self):
+        return self._dataStore
+
     def addOperation(self, operation, name):
         self._operations.append(operation)
         self._tracker.info.append(name)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100622/006f9c5a/attachment-0001.html>


More information about the calendarserver-changes mailing list