[CalendarServer-changes] [5476] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 5476
          http://trac.macosforge.org/projects/calendarserver/changeset/5476
Author:   sagen at apple.com
Date:     2010-04-13 13:29:21 -0700 (Tue, 13 Apr 2010)
Log Message:
-----------
Don't use getattr to check the clonedFromDefault flag, set a value in __init__

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/augment.py
    CalendarServer/trunk/twistedcaldav/directory/directory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/augment.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-04-13 14:11:22 UTC (rev 5475)
+++ CalendarServer/trunk/twistedcaldav/directory/augment.py	2010-04-13 20:29:21 UTC (rev 5476)
@@ -55,6 +55,7 @@
         self.enabledForCalendaring = enabledForCalendaring
         self.enabledForAddressBooks = enabledForAddressBooks
         self.autoSchedule = autoSchedule
+        self.clonedFromDefault = False
 
 class AugmentDB(object):
     """
@@ -86,7 +87,7 @@
                 # Mark default-cloned augment records as such so
                 # DirectoryRecord.addAugmentInformation( ) can avoid unneccesary
                 # error messages:
-                result._clonedFromDefault = True
+                result.clonedFromDefault = True
 
         returnValue(result)
 

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2010-04-13 14:11:22 UTC (rev 5475)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2010-04-13 20:29:21 UTC (rev 5476)
@@ -429,7 +429,7 @@
 
                 # For augment records cloned from the Default augment record,
                 # don't emit this message:
-                if not getattr(augment, "_clonedFromDefault", False):
+                if not augment.clonedFromDefault:
                     self.log_error("Group '%s(%s)' cannot be enabled for calendaring" % (self.guid, self.shortNames[0],))
 
         else:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100413/835aa51a/attachment.html>