[CalendarServer-changes] [13665] CalendarServer/trunk/contrib/od/test/test_live.py

[source_changes at macosforge.org]

Revision: 13665
          http://trac.calendarserver.org//changeset/13665
Author:   sagen at apple.com
Date:     2014-06-20 11:11:52 -0700 (Fri, 20 Jun 2014)
Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/contrib/od/test/test_live.py

Modified: CalendarServer/trunk/contrib/od/test/test_live.py
===================================================================
--- CalendarServer/trunk/contrib/od/test/test_live.py	2014-06-19 23:00:21 UTC (rev 13664)
+++ CalendarServer/trunk/contrib/od/test/test_live.py	2014-06-20 18:11:52 UTC (rev 13665)
@@ -38,14 +38,11 @@
 if moduleImported:
 
     from twext.who.expression import (
-        CompoundExpression, Operand, MatchExpression, MatchType
+        CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags
     )
     from twext.who.idirectory import QueryNotSupportedError
     from txdav.who.directory import CalendarDirectoryServiceMixin
     from txdav.who.opendirectory import DirectoryService as OpenDirectoryService
-    from twext.who.expression import (
-        Operand, MatchType, MatchFlags, MatchExpression
-    )
 
     class CalOpenDirectoryService(OpenDirectoryService, CalendarDirectoryServiceMixin):
         pass
@@ -318,7 +315,7 @@
                 Operand.AND
             )
             try:
-                records = yield self.service.recordsFromExpression(expression)
+                yield self.service.recordsFromExpression(expression)
             except QueryNotSupportedError:
                 pass
             else:
@@ -377,7 +374,7 @@
             )
 
             try:
-                records = yield self.service.recordsFromExpression(expression)
+                yield self.service.recordsFromExpression(expression)
             except QueryNotSupportedError:
                 pass
             else:
@@ -506,4 +503,3 @@
                     "odtestamanda", "odtestgroupalbert", "odtestgroupbetty",
                 ]
             )
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140620/5a51a4d7/attachment-0001.html>