[CalendarServer-changes] [12588] twext/trunk/twext/who/directory.py

[source_changes at macosforge.org]

Revision: 12588
          http://trac.calendarserver.org//changeset/12588
Author:   wsanchez at apple.com
Date:     2014-02-06 09:52:49 -0800 (Thu, 06 Feb 2014)
Log Message:
-----------
Looks like Flags is a subclass of Values, so order matters here.

Modified Paths:
--------------
    twext/trunk/twext/who/directory.py

Modified: twext/trunk/twext/who/directory.py
===================================================================
--- twext/trunk/twext/who/directory.py	2014-02-06 14:22:47 UTC (rev 12587)
+++ twext/trunk/twext/who/directory.py	2014-02-06 17:52:49 UTC (rev 12588)
@@ -358,12 +358,12 @@
         def checkType(name, value):
             expectedType = service.fieldName.valueType(name)
 
-            if issubclass(expectedType, Names):
-                expectedType = NamedConstant
+            if issubclass(expectedType, Flags):
+                expectedType = FlagConstant
             elif issubclass(expectedType, Values):
                 expectedType = ValueConstant
-            elif issubclass(expectedType, Flags):
-                expectedType = FlagConstant
+            elif issubclass(expectedType, Names):
+                expectedType = NamedConstant
 
             if not isinstance(value, expectedType):
                 raise InvalidDirectoryRecordError(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/15c66ae2/attachment.html>