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

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 13 12:57:41 PDT 2013


Revision: 10909
          http://trac.calendarserver.org//changeset/10909
Author:   gaya at apple.com
Date:     2013-03-13 12:57:40 -0700 (Wed, 13 Mar 2013)
Log Message:
-----------
remove unused import

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-13 08:40:59 UTC (rev 10908)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2013-03-13 19:57:40 UTC (rev 10909)
@@ -54,8 +54,7 @@
     _ABO_KIND_GROUP, _ABO_KIND_RESOURCE, _ABO_KIND_LOCATION, schema, \
     _BIND_MODE_OWN, _BIND_MODE_WRITE, _BIND_STATUS_ACCEPTED, \
     _BIND_STATUS_DECLINED, _BIND_STATUS_INVITED
-from txdav.common.icommondatastore import HomeChildNameNotAllowedError, \
-    InternalDataStoreError
+from txdav.common.icommondatastore import InternalDataStoreError
 from txdav.xml.rfc2518 import ResourceType
 
 from zope.interface.declarations import implements
@@ -99,6 +98,7 @@
         return Select([home.RESOURCE_ID, home.HOME_RESOURCE_ID],
                       From=home, Where=home.OWNER_UID == Parameter("ownerUID"))
 
+
     @inlineCallbacks
     def initFromStore(self, no_cache=False):
         """
@@ -253,6 +253,7 @@
         ownerHome = yield self._txn.homeWithResourceID(self._homeType, resourceID)
         returnValue(ownerHome)
 
+
     @classproperty
     def _syncTokenQuery(cls): #@NoSelf
         """
@@ -262,7 +263,7 @@
         bind = cls._bindSchema
         return Select(
             [Max(rev.REVISION)],
-            # active address books
+            # active shared address books
             From=Select(
                 [rev.REVISION],
                 From=rev,
@@ -276,13 +277,13 @@
                     )
                 ),
                 SetExpression=Union(
-                    # deleted address books
+                    # deleted shared address books
                     Select(
                         [rev.REVISION],
                         From=rev,
                         Where=(rev.HOME_RESOURCE_ID == Parameter("resourceID")).And(rev.RESOURCE_ID == None),
                         SetExpression=Union(
-                            # owned address book
+                            # owned address book: owned address book cannot be deleted: See AddressBook.remove()
                             Select(
                                 [rev.REVISION],
                                 From=rev,
@@ -443,7 +444,7 @@
 
             yield self.unshare()  # storebridge should already have done this
 
-            # don't delete, as that will keep showing the same home synctoken/etag
+            # don't delete. Note that revision table is NOT queried for removes
             #yield self._deletedSyncToken()
             yield self._updateRevision(self.name())
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130313/1039ceb4/attachment.html>


More information about the calendarserver-changes mailing list