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

[source_changes at macosforge.org]

Revision: 12515
          http://trac.calendarserver.org//changeset/12515
Author:   wsanchez at apple.com
Date:     2014-01-31 13:51:15 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Simplify describe().  Remove work-around for Twisted ticket #6302 in iterFlags().

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:37:41 UTC (rev 12514)
+++ twext/trunk/twext/who/util.py	2014-01-31 21:51:15 UTC (rev 12515)
@@ -143,22 +143,16 @@
 
 def describe(constant):
     if isinstance(constant, FlagConstant):
-        parts = []
-        for flag in iterFlags(constant):
-            parts.append(getattr(flag, "description", flag.name))
-        return "|".join(parts)
+        return "|".join(
+            getattr(flag, "description", flag.name) for flag in constant
+        )
     else:
         return getattr(constant, "description", constant.name)
 
 
 
 def iterFlags(flags):
-    if hasattr(flags, "__iter__"):
-        return flags
-    else:
-        # Work around http://twistedmatrix.com/trac/ticket/6302
-        # FIXME: This depends on a private attribute (flags._container)
-        return (flags._container.lookupByName(name) for name in flags.names)
+    return iter(flags)
 
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/15f4e0cd/attachment.html>