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

[source_changes at macosforge.org]

Revision: 10663
          http://trac.calendarserver.org//changeset/10663
Author:   wsanchez at apple.com
Date:     2013-02-07 17:54:12 -0800 (Thu, 07 Feb 2013)
Log Message:
-----------
Store results of self.recordsFromExpression in a set, as it's not guaranteed to return a set, and we will be modifying the set, so we don't want to tweak the returned object.

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

Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py	2013-02-08 01:52:08 UTC (rev 10662)
+++ CalendarServer/trunk/twext/who/directory.py	2013-02-08 01:54:12 UTC (rev 10663)
@@ -82,7 +82,7 @@
         except StopIteration:
             returnValue(())
 
-        results = (yield self.recordsFromExpression(expression))
+        results = set((yield self.recordsFromExpression(expression)))
 
         for expression in expressions:
             if (operand == Operand.AND and not results):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130207/f6fcb5f7/attachment.html>