[CalendarServer-changes] [9503] CalendarServer/branches/users/gaya/inviteclean/txdav/common/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 9503
          http://trac.macosforge.org/projects/calendarserver/changeset/9503
Author:   gaya at apple.com
Date:     2012-07-26 17:55:51 -0700 (Thu, 26 Jul 2012)
Log Message:
-----------
minor cleanup

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

Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py	2012-07-26 23:27:32 UTC (rev 9502)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py	2012-07-27 00:55:51 UTC (rev 9503)
@@ -2071,7 +2071,7 @@
 
 
     @classproperty
-    def _insertInviteQuery(cls): #@NoSelf
+    def _inviteInsertQuery(cls): #@NoSelf
         inv = schema.INVITE
         return Insert(
             {
@@ -2133,7 +2133,7 @@
                 seenByOwner=True, seenBySharee=True,
                 bindStatus=status, message=message
             )
-            yield self._insertInviteQuery.on(
+            yield self._inviteInsertQuery.on(
                 subt, uid=newName, name="unused",
                 homeID=shareeHome._resourceID, resourceID=self._resourceID,
                 recipient="unused"
@@ -2293,8 +2293,7 @@
 
         @param homeType: a valid store type (ECALENDARTYPE or EADDRESSBOOKTYPE)
         """
-        mode = self.shareMode()
-        if mode == _BIND_MODE_OWN:
+        if self.owned():
             # This collection may be shared to others
             for sharedToHome in [x.viewerHome() for x in (yield self.asShared())]:
                 (yield self.unshareWith(sharedToHome))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120726/2d21d90d/attachment.html>