[CalendarServer-changes] [1743] CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/ directory/principal.py

[source_changes at macosforge.org]

Revision: 1743
          http://trac.macosforge.org/projects/calendarserver/changeset/1743
Author:   wsanchez at apple.com
Date:     2007-07-31 14:52:19 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
Remove record optional arg for getChild(); use principalForRecord() on parent instead.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/principal.py

Modified: CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/principal.py	2007-07-31 21:28:56 UTC (rev 1742)
+++ CalendarServer/branches/users/wsanchez/deleted-uids/twistedcaldav/directory/principal.py	2007-07-31 21:52:19 UTC (rev 1743)
@@ -196,7 +196,10 @@
 
     def getChild(self, name):
         self.provision()
-        return self.putChildren.get(name, None)
+        if name == "":
+            return self
+        else:
+            return self.putChildren.get(name, None)
 
     def listChildren(self):
         return self.directory.recordTypes()
@@ -243,16 +246,12 @@
         log.err("Attempt to create clone %r of resource %r" % (path, self))
         raise HTTPError(responsecode.NOT_FOUND)
 
-    def getChild(self, name, record=None):
+    def getChild(self, name):
         self.provision()
         if name == "":
             return self
-
-        if record is None:
-            return self.principalForShortName(self.recordType, name)
         else:
-            assert name is None
-            return self.principalForRecord(record)
+            return self.principalForShortName(self.recordType, name)
 
     def listChildren(self):
         return (record.shortName for record in self.directory.listRecords(self.recordType))
@@ -464,11 +463,8 @@
             myRecordType = self.record.recordType
             for relative in getattr(record, method)():
                 if relative not in records:
-                    if relative.recordType == myRecordType: 
-                        found = self.parent.getChild(None, record=relative)
-                    else:
-                        found = self.parent.parent.getChild(relative.recordType).getChild(None, record=relative)
-                    
+                    found = self.parent.principalForRecord(relative)
+
                     if proxy:
                         found = found.getChild("calendar-proxy-write")
                     relatives.add(found)
@@ -605,7 +601,7 @@
         log.err("Attempt to create clone %r of resource %r" % (path, self))
         raise HTTPError(responsecode.NOT_FOUND)
 
-    def getChild(self, name, record=None):
+    def getChild(self, name):
         if name == "":
             return self
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070731/ea3800d8/attachment.html