[CalendarServer-changes] [3462] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3462
          http://trac.macosforge.org/projects/calendarserver/changeset/3462
Author:   cdaboo at apple.com
Date:     2008-12-04 18:07:09 -0800 (Thu, 04 Dec 2008)
Log Message:
-----------
More "type" clean-up.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/admin/util.py
    CalendarServer/trunk/twistedcaldav/ical.py
    CalendarServer/trunk/twistedcaldav/scheduling/ischeduleservers.py

Modified: CalendarServer/trunk/twistedcaldav/admin/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/util.py	2008-12-05 00:03:58 UTC (rev 3461)
+++ CalendarServer/trunk/twistedcaldav/admin/util.py	2008-12-05 02:07:09 UTC (rev 3462)
@@ -111,7 +111,7 @@
 
     collection = False
 
-    type = None
+    rtype = None
 
     dom = microdom.parseString(_getxattr_value(x, rt))
     rt = microdom.getElementsByTagName(dom, 'resourcetype')
@@ -120,9 +120,9 @@
         if child.tagName == 'collection':
             collection = True
         else:
-            type = child.tagName
+            rtype = child.tagName
 
-    return (collection, type)
+    return (collection, rtype)
 
 
 class EventCountingDatabase(AbstractSQLDatabase):

Modified: CalendarServer/trunk/twistedcaldav/ical.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/ical.py	2008-12-05 00:03:58 UTC (rev 3461)
+++ CalendarServer/trunk/twistedcaldav/ical.py	2008-12-05 02:07:09 UTC (rev 3462)
@@ -411,16 +411,16 @@
         """
         assert self.name() == "VCALENDAR", "Must be a VCALENDAR: %r" % (self,)
         
-        type = None
+        mtype = None
         for component in self.subcomponents():
             if component.name() == "VTIMEZONE":
                 continue
-            elif type and (type != component.name()):
+            elif mtype and (mtype != component.name()):
                 raise ValueError("Component contains more than one type of primary type: %r" % (self,))
             else:
-                type = component.name()
+                mtype = component.name()
         
-        return type
+        return mtype
     
     def mainComponent(self, allow_multiple=False):
         """

Modified: CalendarServer/trunk/twistedcaldav/scheduling/ischeduleservers.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/ischeduleservers.py	2008-12-05 00:03:58 UTC (rev 3461)
+++ CalendarServer/trunk/twistedcaldav/scheduling/ischeduleservers.py	2008-12-05 02:07:09 UTC (rev 3462)
@@ -165,8 +165,8 @@
 
     def _parseAuthentication(self, node):
         if node.hasAttribute(ATTRIBUTE_TYPE):
-            type = node.getAttribute(ATTRIBUTE_TYPE).encode("utf-8")
-            if type != ATTRIBUTE_BASICAUTH:
+            atype = node.getAttribute(ATTRIBUTE_TYPE).encode("utf-8")
+            if atype != ATTRIBUTE_BASICAUTH:
                 return
         else:
             return
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081204/214fca1c/attachment.html>