[CalendarServer-changes] [10721] CalendarServer/trunk/twext/who/xml.py

[source_changes at macosforge.org]

Revision: 10721
          http://trac.calendarserver.org//changeset/10721
Author:   wsanchez at apple.com
Date:     2013-02-13 17:49:49 -0800 (Wed, 13 Feb 2013)
Log Message:
-----------
Minor cleanup

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

Modified: CalendarServer/trunk/twext/who/xml.py
===================================================================
--- CalendarServer/trunk/twext/who/xml.py	2013-02-14 01:49:20 UTC (rev 10720)
+++ CalendarServer/trunk/twext/who/xml.py	2013-02-14 01:49:49 UTC (rev 10721)
@@ -43,7 +43,7 @@
 from twext.who.idirectory import DirectoryQueryMatchExpression
 from twext.who.directory import DirectoryService as BaseDirectoryService
 from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
-from twext.who.directory import MergedConstants
+from twext.who.util import MergedConstants
 
 
 
@@ -136,7 +136,7 @@
     XML directory service.
     """
 
-    fieldName = MergedConstants(BaseFieldName, FieldName)
+    fieldName = MergedConstants(BaseDirectoryService.fieldName, FieldName)
 
     element   = Element
     attribute = Attribute
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130213/e17b7c72/attachment-0001.html>