[CalendarServer-changes] [9764] CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/ resource.py

[source_changes at macosforge.org]

Revision: 9764
          http://trac.macosforge.org/projects/calendarserver/changeset/9764
Author:   gaya at apple.com
Date:     2012-08-31 15:40:26 -0700 (Fri, 31 Aug 2012)
Log Message:
-----------
clean comments

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/resource.py

Modified: CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/resource.py	2012-08-31 20:53:57 UTC (rev 9763)
+++ CalendarServer/branches/users/gaya/inviteclean/twistedcaldav/resource.py	2012-08-31 22:40:26 UTC (rev 9764)
@@ -492,25 +492,6 @@
         """
         Need to special case schedule-calendar-transp for backwards compatability.
         """
-        
-        #TODO: Remove old code below
-        '''
-        if type(property) is tuple:
-            qname = property
-        else:
-            qname = property.qname()
-        isShareeCollection = self.isShareeCollection()
-        if isShareeCollection:
-            if self.isShadowableProperty(qname):
-                p = self.deadProperties().contains(qname)
-                if p:
-                    returnValue(p)
-                
-            elif (not self.isGlobalProperty(qname)):
-                result = self._hasSharedProperty(qname, request)
-                returnValue(result)
-        '''
-
         res = (yield self._hasGlobalProperty(property, request))
         returnValue(res)
 
@@ -571,22 +552,6 @@
 
                 returnValue(customxml.PubSubXMPPPushKeyProperty())
         
-        #TODO: Remove old code below
-        ''' 
-        isShareeCollection = self.isShareeCollection()
-        if isShareeCollection:
-            if self.isShadowableProperty(qname):
-                try:
-                    p = self.deadProperties().get(qname)
-                    returnValue(p)
-                except PropertyNotFoundError:
-                    pass
-                
-            elif (not self.isGlobalProperty(qname)):
-                result = self._readSharedProperty(qname, request)
-                returnValue(result)
-        '''
-
         res = (yield self._readGlobalProperty(qname, property, request))
         returnValue(res)
 
@@ -723,17 +688,6 @@
         assert isinstance(property, element.WebDAVElement), (
             "%r is not a WebDAVElement instance" % (property,)
         )
-        
-        #TODO: Remove old code below
-        '''
-        # Per-user Dav props currently only apply to a sharee's copy of a calendar
-        isShareeCollection = self.isShareeCollection()
-
-        if isShareeCollection and (self.isShadowableProperty(property.qname()) or (not self.isGlobalProperty(property.qname()))):
-            yield self._preProcessWriteProperty(property, request, isShare=True)
-            p = self.deadProperties().set(property)
-            returnValue(p)
-        '''
  
         res = (yield self._writeGlobalProperty(property, request))
         returnValue(res)
@@ -974,16 +928,6 @@
         This is the owner of the resource based on the URI used to access it. For a shared
         collection it will be the sharee, otherwise it will be the regular the ownerPrincipal.
         """
-        #TODO: Remove old code below:
-        '''
-        isShareeCollection = self.isShareeCollection()
-        if isShareeCollection:
-            returnValue(self._shareePrincipal)
-        else:
-            parent = (yield self.locateParent(
-                request, request.urlForResource(self)
-            ))
-        '''
         parent = (yield self.locateParent(
             request, request.urlForResource(self)
         ))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120831/9f6786b7/attachment-0001.html>