[CalendarServer-changes] [12138] twext/trunk/twext/who/opendirectory/service.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:15:35 PDT 2014


Revision: 12138
          http://trac.calendarserver.org//changeset/12138
Author:   wsanchez at apple.com
Date:     2013-12-18 17:50:49 -0800 (Wed, 18 Dec 2013)
Log Message:
-----------
Declare supported record types

Modified Paths:
--------------
    twext/trunk/twext/who/opendirectory/service.py

Modified: twext/trunk/twext/who/opendirectory/service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/service.py	2013-12-19 01:47:58 UTC (rev 12137)
+++ twext/trunk/twext/who/opendirectory/service.py	2013-12-19 01:50:49 UTC (rev 12138)
@@ -21,8 +21,6 @@
 OpenDirectory directory service implementation.
 """
 
-from itertools import chain
-
 from odframework import ODSession, ODNode, ODQuery
 
 from twisted.python.constants import Names, NamedConstant
@@ -237,13 +235,14 @@
 
     log = Logger()
 
-    fieldName = ConstantsContainer(chain(
-        BaseDirectoryService.fieldName.iterconstants(),
-        FieldName.iterconstants()
+    recordType = ConstantsContainer((
+        BaseRecordType.user, BaseRecordType.group,
     ))
 
+    fieldName = ConstantsContainer((BaseDirectoryService.fieldName, FieldName))
 
 
+
     def __init__(self, nodeName=ODSearchPath.search.value):
         """
         @param nodeName: the OpenDirectory node to query against.
@@ -283,8 +282,8 @@
     # @property
     # def localNode(self):
     #     """
-    #     Get the local node from the search path (if any), so that we can handle
-    #     it specially.
+    #     Get the local node from the search path (if any), so that we can
+    #     handle it specially.
     #     """
     #     if not hasattr(self, "_localNode"):
     #         if self.nodeName == ODSearchPath.search.value:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/320826e0/attachment.html>


More information about the calendarserver-changes mailing list