[CalendarServer-changes] [9052] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory

[source_changes at macosforge.org]

Revision: 9052
          http://trac.macosforge.org/projects/calendarserver/changeset/9052
Author:   gaya at apple.com
Date:     2012-04-13 11:29:48 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
clean up imports

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-13 17:28:45 UTC (rev 9051)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-13 18:29:48 UTC (rev 9052)
@@ -24,15 +24,13 @@
 ]
 
 import traceback
-
+import ldap
 import sys
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
 from twistedcaldav.config import config
 from twistedcaldav.directory.ldapdirectory import LdapDirectoryService
-
-import ldap
 from twistedcaldav.directory.opendirectorybacker import ABDirectoryQueryResult, dsFilterFromAddressBookFilter, propertiesInAddressBookQuery
 
 
@@ -72,7 +70,6 @@
             "appleInternalServer":False,    # does magic in ABDirectoryQueryResult
             "maxQueryResults":0,            # max records returned
             "fakeETag":True,                # eTag is fake, otherwise it is md5(all attributes)
-            "generateSimpleUIDs":False,     # if UID is faked, use simple method for generating
        }
 
         #params = self.getParams(params, defaults, ignored)
@@ -94,8 +91,6 @@
         del params["maxQueryResults"]
         fakeETag=params["fakeETag"]
         del params["fakeETag"]
-        generateSimpleUIDs=params["generateSimpleUIDs"]
-        del params["generateSimpleUIDs"]
 
         
         #standardize ds attributes type names
@@ -133,7 +128,6 @@
         
         ### params for ABDirectoryQueryResult()
         self.fakeETag = fakeETag
-        self.generateSimpleUIDs = generateSimpleUIDs
         self.appleInternalServer = appleInternalServer
  
         super(LdapDirectoryBackingService, self).__init__(params)
@@ -234,7 +228,7 @@
                                 self.log_debug("doAddressBookQuery: dsRecordAttributes[%s] = %s" % (dsAttributeName, dsRecordAttributes[dsAttributeName],))
 
                 # get a record for dsRecordAttributes 
-                result = ABDirectoryQueryResult(self.directoryBackedAddressBook, dsRecordAttributes, generateSimpleUIDs=self.generateSimpleUIDs, appleInternalServer=self.appleInternalServer)
+                result = ABDirectoryQueryResult(self.directoryBackedAddressBook, dsRecordAttributes, appleInternalServer=self.appleInternalServer)
             except:
                 traceback.print_exc()
                 self.log_info("Could not get vcard for %s" % (dn,))

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-13 17:28:45 UTC (rev 9051)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-13 18:29:48 UTC (rev 9052)
@@ -24,10 +24,12 @@
 ]
 
 import traceback
+
+from calendarserver.platform.darwin.od import dsattributes, dsquery
+
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.opendirectorybacker import ABDirectoryQueryResult, dsFilterFromAddressBookFilter
-from calendarserver.platform.darwin.od import dsattributes, dsquery
 
 
 class XMLDirectoryBackingService(XMLDirectoryService):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120413/6ce88e7e/attachment-0001.html>