[CalendarServer-changes] [12345] twext/trunk/twext/who/opendirectory/_service.py

[source_changes at macosforge.org]

Revision: 12345
          http://trac.calendarserver.org//changeset/12345
Author:   wsanchez at apple.com
Date:     2014-01-14 16:55:34 -0800 (Tue, 14 Jan 2014)
Log Message:
-----------
FieldName is duplicated

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

Modified: twext/trunk/twext/who/opendirectory/_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/_service.py	2014-01-14 23:33:27 UTC (rev 12344)
+++ twext/trunk/twext/who/opendirectory/_service.py	2014-01-15 00:55:34 UTC (rev 12345)
@@ -23,7 +23,6 @@
 
 from zope.interface import implementer
 
-from twisted.python.constants import Names, NamedConstant
 from twisted.internet.defer import succeed, fail
 from twisted.web.guard import DigestCredentialFactory
 
@@ -48,7 +47,8 @@
 
 from ._odframework import ODSession, ODNode, ODQuery
 from ._constants import (
-    ODSearchPath, ODRecordType, ODAttribute, ODMatchType, ODAuthMethod
+    FieldName,
+    ODSearchPath, ODRecordType, ODAttribute, ODMatchType, ODAuthMethod,
 )
 
 
@@ -93,25 +93,6 @@
 
 
 #
-# Constants
-#
-
-class FieldName(Names):
-    searchPath = NamedConstant()
-    searchPath.description = u"search path"
-    searchPath.multiValue = False
-
-    metaNodeLocation = NamedConstant()
-    metaNodeLocation.description = u"source OD node"
-    metaNodeLocation.multiValue = False
-
-    metaRecordName = NamedConstant()
-    metaRecordName.description = u"meta record name"
-    metaRecordName.multiValue = False
-
-
-
-#
 # Directory Service
 #
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/2e73d67a/attachment.html>