[CalendarServer-changes] [10961] CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 10961
          http://trac.calendarserver.org//changeset/10961
Author:   gaya at apple.com
Date:     2013-03-20 17:34:38 -0700 (Wed, 20 Mar 2013)
Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/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-03-20 19:32:29 UTC (rev 10960)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-03-21 00:34:38 UTC (rev 10961)
@@ -85,6 +85,8 @@
         self._homeResourceID = None
         self._addressbook = None
 
+    def __repr__(self):
+        return '<%s: %s("%s")>' % (self.__class__.__name__, self._resourceID, self.name())
 
     addressbooks = CommonHome.children
     listAddressbooks = CommonHome.listChildren
@@ -360,6 +362,8 @@
         self._index = PostgresLegacyABIndexEmulator(self)
         self._bindName = bindName
 
+    def __repr__(self):
+        return '<%s: %s("%s")>' % (self.__class__.__name__, self._resourceID, self.name())
 
     def getCreated(self):
         return self.ownerHome()._created
@@ -675,7 +679,6 @@
     @classmethod
     @inlineCallbacks
     def objectWithName(cls, home, name, accepted=True):
-        # replaces objectWithName()
         """
         Retrieve the child with the given C{name} contained in the given
         C{home}.
@@ -687,10 +690,8 @@
         @return: an L{CommonHomeChild} or C{None} if no such child
             exists.
         """
-        if accepted:
-            addressbook = yield home.addressbook()
-            if name == addressbook.name():
-                returnValue(addressbook)
+        if accepted and name == home.addressbook().name():
+            returnValue(home.addressbook())
 
         #all shared address books now
         rows = None
@@ -708,7 +709,7 @@
             ownerHome = yield home._txn.addressbookHomeWithUID(name)
             if ownerHome:
                 # see if address book resource id in bind table
-                ownerAddressBook = yield ownerHome.addressbook()
+                ownerAddressBook = ownerHome.addressbook()
                 rows = yield cls._bindForResourceIDAndHomeID.on(
                     home._txn, resourceID=ownerAddressBook._resourceID, homeID=home._resourceID
                 )
@@ -743,7 +744,7 @@
             returnValue(None)
 
         ownerHome = yield home.ownerHomeWithChildID(ownerAddressBookID)
-        ownerAddressBook = yield ownerHome.addressbook()
+        ownerAddressBook = ownerHome.addressbook()
         child = cls(
                 home=home,
                 name=ownerAddressBook.shareeAddressBookName(), resourceID=ownerAddressBookID,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130320/b75c1cc0/attachment.html>