[CalendarServer-changes] [12486] twext/trunk/twext/who/ldap/_service.py

[source_changes at macosforge.org]

Revision: 12486
          http://trac.calendarserver.org//changeset/12486
Author:   wsanchez at apple.com
Date:     2014-01-30 15:15:40 -0800 (Thu, 30 Jan 2014)
Log Message:
-----------
We got rid of dn constant.

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

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2014-01-30 23:07:43 UTC (rev 12485)
+++ twext/trunk/twext/who/ldap/_service.py	2014-01-30 23:15:40 UTC (rev 12486)
@@ -139,8 +139,8 @@
 
 # Maps field name -> LDAP attribute names
 DEFAULT_FIELDNAME_ATTRIBUTE_MAP = MappingProxyType({
-    FieldName.dn: (LDAPAttribute.dn.value,),
-    BaseFieldName.uid: (LDAPAttribute.dn.value,),
+    # FieldName.dn: (LDAPAttribute.dn.value,),
+    # BaseFieldName.uid: (LDAPAttribute.dn.value,),
     BaseFieldName.guid: (LDAPAttribute.generatedUUID.value,),
     BaseFieldName.shortNames: (LDAPAttribute.uid.value,),
     BaseFieldName.fullNames: (LDAPAttribute.cn.value,),
@@ -367,18 +367,6 @@
 
         for dn, recordData in reply:
 
-            # # Fetch the UID
-
-            # try:
-            #     uid = recordData[uidAttribute]
-            # except KeyError:
-            #     self.log.debug(
-            #         "Ignoring LDAP record data; no UID attribute "
-            #         "({log_source._uidField}): {recordData!r}",
-            #         recordData=recordData
-            #     )
-            #     continue
-
             # Determine the record type
 
             recordType = recordTypeForRecordData(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/20f265aa/attachment.html>