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

source_changes at macosforge.org source_changes at macosforge.org
Wed Feb 13 17:49:20 PST 2013


Revision: 10720
          http://trac.calendarserver.org//changeset/10720
Author:   wsanchez at apple.com
Date:     2013-02-13 17:49:20 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
No need to use MergedConstants on one container.

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

Modified: CalendarServer/trunk/twext/who/directory.py
===================================================================
--- CalendarServer/trunk/twext/who/directory.py	2013-02-14 01:30:18 UTC (rev 10719)
+++ CalendarServer/trunk/twext/who/directory.py	2013-02-14 01:49:20 UTC (rev 10720)
@@ -36,7 +36,7 @@
 from twext.who.idirectory import Operand
 from twext.who.idirectory import DirectoryQueryMatchExpression
 from twext.who.idirectory import IDirectoryService, IDirectoryRecord
-from twext.who.util import MergedConstants, uniqueResult
+from twext.who.util import uniqueResult
 
 
 
@@ -47,8 +47,8 @@
         "realmName",
     )
 
-    recordType = MergedConstants(RecordType)
-    fieldName  = MergedConstants(FieldName)
+    recordType = RecordType
+    fieldName  = FieldName
 
     fieldNormalizer = {
         FieldName.guid:           lambda g: UUID(g).hex,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130213/d5e8d54d/attachment.html>


More information about the calendarserver-changes mailing list