[CalendarServer-changes] [11115] CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav

[source_changes at macosforge.org]

Revision: 11115
          http://trac.calendarserver.org//changeset/11115
Author:   gaya at apple.com
Date:     2013-04-30 12:20:15 -0700 (Tue, 30 Apr 2013)
Log Message:
-----------
simplify expressions using isSharedResource()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/method/put_common.py
    CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/resource.py
    CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/sharing.py
    CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/storebridge.py

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/method/put_common.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/method/put_common.py	2013-04-30 03:24:33 UTC (rev 11114)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/method/put_common.py	2013-04-30 19:20:15 UTC (rev 11115)
@@ -1036,8 +1036,7 @@
             if do_implicit_action and self.allowImplicitSchedule:
 
                 # Cannot do implicit in sharee's shared calendar
-                isShareeResource = self.destinationparent.isShareeResource()
-                if isShareeResource:
+                if self.destinationparent.isShareeResource():
                     scheduler.setSchedulingNotAllowed(
                         HTTPError,
                         ErrorResponse(

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/resource.py	2013-04-30 03:24:33 UTC (rev 11114)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/resource.py	2013-04-30 19:20:15 UTC (rev 11115)
@@ -712,9 +712,7 @@
                 returnValue(customxml.AllowedSharingModes(customxml.CanBeShared()))
 
         elif qname == customxml.SharedURL.qname():
-            isShareeResource = self.isShareeResource()
-
-            if isShareeResource:
+            if self.isShareeResource():
                 returnValue(customxml.SharedURL(element.HRef.fromString(self._share.url())))
             else:
                 returnValue(None)
@@ -833,8 +831,7 @@
     def accessControlList(self, request, *args, **kwargs):
 
         acls = None
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             acls = (yield self.shareeAccessControlList(request, *args, **kwargs))
 
         if acls is None:
@@ -890,8 +887,7 @@
         Return the DAV:owner property value (MUST be a DAV:href or None).
         """
 
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             parent = (yield self.locateParent(request, self._share.url()))
         else:
             parent = (yield self.locateParent(request, request.urlForResource(self)))
@@ -907,8 +903,7 @@
         """
         Return the DAV:owner property value (MUST be a DAV:href or None).
         """
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             parent = (yield self.locateParent(request, self._share.url()))
         else:
             parent = (yield self.locateParent(request, request.urlForResource(self)))
@@ -1342,15 +1337,13 @@
         """
 
         sharedParent = None
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             # A sharee collection's quota root is the resource owner's root
             sharedParent = (yield request.locateResource(parentForURL(self._share.url())))
         else:
             parent = (yield self.locateParent(request, request.urlForResource(self)))
             if isCalendarCollectionResource(parent) or isAddressBookCollectionResource(parent):
-                isShareeResource = parent.isShareeResource()
-                if isShareeResource:
+                if parent.isShareeResource():
                     # A sharee collection's quota root is the resource owner's root
                     sharedParent = (yield request.locateResource(parentForURL(parent._share.url())))
 

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/sharing.py	2013-04-30 03:24:33 UTC (rev 11114)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/sharing.py	2013-04-30 19:20:15 UTC (rev 11115)
@@ -304,8 +304,7 @@
         else:
             rtype = superMethod()
 
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             rtype = element.ResourceType(
                 *(
                     tuple([child for child in rtype.children if child.qname() != customxml.SharedOwner.qname()]) +

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/storebridge.py	2013-04-30 03:24:33 UTC (rev 11114)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/storebridge.py	2013-04-30 19:20:15 UTC (rev 11115)
@@ -451,8 +451,7 @@
         """
 
         # Check sharee collection first
-        isShareeResource = self.isShareeResource()
-        if isShareeResource:
+        if self.isShareeResource():
             log.debug("Removing shared collection %s" % (self,))
             yield self.removeShareeCollection(request)
             returnValue(NO_CONTENT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130430/e5d35440/attachment.html>