[CalendarServer-changes] [12516] twext/trunk/twext/who/util.py

[source_changes at macosforge.org]

Revision: 12516
          http://trac.calendarserver.org//changeset/12516
Author:   wsanchez at apple.com
Date:     2014-01-31 14:02:30 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Handle non-constants in describe()

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

Modified: twext/trunk/twext/who/util.py
===================================================================
--- twext/trunk/twext/who/util.py	2014-01-31 21:51:15 UTC (rev 12515)
+++ twext/trunk/twext/who/util.py	2014-01-31 22:02:30 UTC (rev 12516)
@@ -146,11 +146,17 @@
         return "|".join(
             getattr(flag, "description", flag.name) for flag in constant
         )
-    else:
-        return getattr(constant, "description", constant.name)
 
+    if isinstance(constant, (NamedConstant, ValueConstant)):
+        for attr in ("description", "name"):
+            description = getattr(constant, attr, None)
+            if description is not None:
+                return description
 
+    return unicode(constant)
 
+
+
 def iterFlags(flags):
     return iter(flags)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/095213b3/attachment.html>