[CalendarServer-changes] [10816] CalendarServer/branches/users/gaya/sharedgroups/txdav

[source_changes at macosforge.org]

Revision: 10816
          http://trac.calendarserver.org//changeset/10816
Author:   gaya at apple.com
Date:     2013-02-26 12:29:44 -0800 (Tue, 26 Feb 2013)
Log Message:
-----------
ownerHomeWithResourceID(), ownerHomeFromChildID() renamed ownerHomeWithChildID()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-02-26 20:14:25 UTC (rev 10815)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-02-26 20:29:44 UTC (rev 10816)
@@ -201,7 +201,7 @@
 
 
     @inlineCallbacks
-    def ownerHomeFromChildID(self, resourceID):
+    def ownerHomeWithChildID(self, resourceID):
         """
         Get the owner home for a shared child ID
         """
@@ -540,7 +540,7 @@
         for dataRow in dataRows:
             bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = dataRow[:6] #@UnusedVariable
             assert bindStatus != _BIND_MODE_OWN
-            ownerHome = yield home.ownerHomeFromChildID(resourceID)
+            ownerHome = yield home.ownerHomeWithChildID(resourceID)
             ownerHomeID = ownerHome._resourceID
             ownerHomeIDToDataRowMap[ownerHomeID] = dataRow
 
@@ -586,7 +586,7 @@
                         message=bindMessage,
                     )
                 else:
-                    ownerHome = yield home.ownerHomeFromChildID(resourceID)
+                    ownerHome = yield home.ownerHomeWithChildID(resourceID)
                     ownerAddressBook = yield ownerHome.addressbook()
 
                     child = cls(
@@ -688,7 +688,7 @@
         if (cachedBindStatus == _BIND_STATUS_ACCEPTED) != bool(accepted):
             returnValue(None)
 
-        ownerHome = yield home.ownerHomeFromChildID(ownerAddressBookID)
+        ownerHome = yield home.ownerHomeWithChildID(ownerAddressBookID)
         ownerAddressBook = yield ownerHome.addressbook()
         child = cls(
                 home=home,
@@ -721,7 +721,7 @@
             if (bindStatus == _BIND_STATUS_ACCEPTED) == bool(accepted):
                 # alt:
                 # returnValue((yield cls.objectWithID(home, resourceID)))
-                ownerHome = yield home.ownerHomeFromChildID(resourceID)
+                ownerHome = yield home.ownerHomeWithChildID(resourceID)
                 ownerAddressBook = yield ownerHome.addressbook()
                 if accepted:
                     returnValue((yield home.childWithName(ownerAddressBook.shareeABName())))
@@ -737,7 +737,7 @@
                 ownerAddressBookID = yield AddressBookObject.ownerAddressBookFromGroupID(home._txn, resourceID)
                 # alt:
                 # addressbook = yield cls.objectWithID(home, ownerAddressBookID)
-                ownerHome = yield home.ownerHomeFromChildID(ownerAddressBookID)
+                ownerHome = yield home.ownerHomeWithChildID(ownerAddressBookID)
                 ownerAddressBook = yield ownerHome.addressbook()
                 if accepted:
                     addressbook = yield home.childWithName(ownerAddressBook.shareeABName())
@@ -782,7 +782,7 @@
         if groupBindRows:
             bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = groupBindRows[0] #@UnusedVariable
             ownerAddressBookID = yield AddressBookObject.ownerAddressBookFromGroupID(home._txn, resourceID)
-            ownerHome = yield home.ownerHomeFromChildID(ownerAddressBookID)
+            ownerHome = yield home.ownerHomeWithChildID(ownerAddressBookID)
             ownerAddressBook = yield ownerHome.addressbook()
             if bindStatus == _BIND_STATUS_ACCEPTED:
                 returnValue((yield home.childWithName(ownerAddressBook.shareeABName())))

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-02-26 20:14:25 UTC (rev 10815)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/common/datastore/sql.py	2013-02-26 20:29:44 UTC (rev 10816)
@@ -2130,7 +2130,7 @@
         ).on(self._txn, **kwds)
 
     @inlineCallbacks
-    def ownerHomeFromChildID(self, resourceID):
+    def ownerHomeWithChildID(self, resourceID):
         """
         Get the owner home for a shared child ID
         Subclasses may override.
@@ -3015,7 +3015,7 @@
                 ownerHome = home
             else:
                 #TODO: get all ownerHomeIDs at once
-                ownerHome = yield home.ownerHomeFromChildID(resourceID)
+                ownerHome = yield home.ownerHomeWithChildID(resourceID)
 
             child = cls(
                 home=home,
@@ -3078,7 +3078,7 @@
         if bindMode == _BIND_MODE_OWN:
             ownerHome = home
         else:
-            ownerHome = yield home.ownerHomeWithResourceID(resourceID)
+            ownerHome = yield home.ownerHomeWithChildID(resourceID)
 
         child = cls(
             home=home,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130226/30eb85ea/attachment-0001.html>