[CalendarServer-changes] [10778] CalendarServer/trunk/twext/who

[source_changes at macosforge.org]

Revision: 10778
          http://trac.calendarserver.org//changeset/10778
Author:   wsanchez at apple.com
Date:     2013-02-21 16:11:05 -0800 (Thu, 21 Feb 2013)
Log Message:
-----------
service.recordTypes() no longer defers.

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

Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py	2013-02-21 23:27:19 UTC (rev 10777)
+++ CalendarServer/trunk/twext/who/directory.py	2013-02-22 00:11:05 UTC (rev 10778)
@@ -64,7 +64,7 @@
 
 
     def recordTypes(self):
-        return succeed(self.recordType.iterconstants())
+        return self.recordType.iterconstants()
 
 
     def recordsFromExpression(self, expression, records=None):

Modified: CalendarServer/trunk/twext/who/idirectory.py
===================================================================
--- CalendarServer/trunk/twext/who/idirectory.py	2013-02-21 23:27:19 UTC (rev 10777)
+++ CalendarServer/trunk/twext/who/idirectory.py	2013-02-22 00:11:05 UTC (rev 10778)
@@ -160,8 +160,8 @@
 
     def recordTypes():
         """
-        @return: a deferred iterable of L{NamedConstant}s denoting the
-            record types that are kept in this directory.
+        @return: an iterable of L{NamedConstant}s denoting the record
+            types that are kept in this directory.
         """
 
     def recordsFromQuery(expressions, operand=Operand.AND):

Modified: CalendarServer/trunk/twext/who/test/test_directory.py
===================================================================
--- CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-21 23:27:19 UTC (rev 10777)
+++ CalendarServer/trunk/twext/who/test/test_directory.py	2013-02-22 00:11:05 UTC (rev 10778)
@@ -61,11 +61,10 @@
         self.assertEquals(repr(service), "<DirectoryService 'xyzzy'>")
 
 
-    @inlineCallbacks
     def test_recordTypes(self):
         service = self.service()
         self.assertEquals(
-            set((yield service.recordTypes())),
+            set(service.recordTypes()),
             set(service.recordType.iterconstants())
         )
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130221/aa60345f/attachment.html>