[CalendarServer-changes] [944] CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/ directory/calendaruserproxy.py

[source_changes at macosforge.org]

Revision: 944
          http://trac.macosforge.org/projects/calendarserver/changeset/944
Author:   cdaboo at apple.com
Date:     2007-01-05 13:03:56 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
Cleaned-up docstring and argument name.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendaruserproxy.py

Modified: CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendaruserproxy.py
===================================================================
--- CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendaruserproxy.py	2007-01-05 21:00:32 UTC (rev 943)
+++ CalendarServer/branches/users/cdaboo/cuproxy-857/twistedcaldav/directory/calendaruserproxy.py	2007-01-05 21:03:56 UTC (rev 944)
@@ -70,17 +70,17 @@
     """
     Calendar user proxy principal resource.
     """
-    def __init__(self, path, parent, type):
+    def __init__(self, path, parent, proxyType):
         """
-        @param path: them path to the file which will back this resource.
+        @param path: the path to the file which will back this resource.
         @param parent: the parent of this resource.
-        @param type: the L{IDirectoryRecord} that this resource represents.
+        @param proxyType: a C{str} containing the name of the resource.
         """
-        super(CalendarUserProxyPrincipalResource, self).__init__(path, joinURL(parent.principalURL(), type))
+        super(CalendarUserProxyPrincipalResource, self).__init__(path, joinURL(parent.principalURL(), proxyType))
 
         self.parent = parent
-        self.type = type
-        self._url = joinURL(parent.principalURL(), type)
+        self.proxyType = proxyType
+        self._url = joinURL(parent.principalURL(), proxyType)
         if self.isCollection():
             self._url += "/"
 
@@ -104,9 +104,9 @@
         return pcollection.calendar_user_proxy_db
 
     def resourceType(self):
-        if self.type == "calendar-proxy-read":
+        if self.proxyType == "calendar-proxy-read":
             return davxml.ResourceType.calendarproxyread
-        elif self.type == "calendar-proxy-write":
+        elif self.proxyType == "calendar-proxy-write":
             return davxml.ResourceType.calendarproxywrite
         else:
             return super(CalendarUserProxyPrincipalResource, self).resourceType()
@@ -206,7 +206,7 @@
     ##
 
     def displayName(self):
-        return self.type
+        return self.proxyType
 
     ##
     # ACL

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