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

source_changes at macosforge.org source_changes at macosforge.org
Thu Apr 12 14:19:44 PDT 2012


Revision: 9042
          http://trac.macosforge.org/projects/calendarserver/changeset/9042
Author:   gaya at apple.com
Date:     2012-04-12 14:19:44 -0700 (Thu, 12 Apr 2012)
Log Message:
-----------
cleanup pyflakes complaints

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-12 20:39:14 UTC (rev 9041)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-12 21:19:44 UTC (rev 9042)
@@ -24,18 +24,12 @@
 ]
 
 import traceback
-import hashlib
 
-import os
 import sys
-import time
 
-from socket import getfqdn
-
-from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
-from twistedcaldav.directory.directory import DirectoryRecord
+from twistedcaldav.config import config
 from twistedcaldav.directory.ldapdirectory import LdapDirectoryService
 
 import ldap
@@ -83,8 +77,6 @@
 
         #params = self.getParams(params, defaults, ignored)
         def addDefaults(params, defaults, remove=None):
-            keys = set(params.keys())
-
             for key in defaults:
                 if not key in params:
                     params[key] = defaults[key]
@@ -317,7 +309,7 @@
                     for uid, ldapQueryResult in ldapQueryResultsDictionary.iteritems():
 
                         if uid in resultsDictionary:
-                            self.log_info("Record skipped due to duplicate UID: %s" % (dn,))
+                            self.log_info("Record skipped due to duplicate UID: %s" % (uid,))
                             continue
                     
                         if not addressBookFilter.match(ldapQueryResult.vCard()):

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-12 20:39:14 UTC (rev 9041)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-12 21:19:44 UTC (rev 9042)
@@ -24,20 +24,8 @@
 ]
 
 import traceback
-import hashlib
-
-import os
-import sys
-import time
-
-from socket import getfqdn
-
-from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
-
-from twistedcaldav.directory.directory import DirectoryRecord
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
-
 from twistedcaldav.directory.opendirectorybacker import ABDirectoryQueryResult, dsFilterFromAddressBookFilter
 from calendarserver.platform.darwin.od import dsattributes, dsquery
 
@@ -93,8 +81,6 @@
 
         #params = self.getParams(params, defaults, ignored)
         def addDefaults(params, defaults, remove=None):
-            keys = set(params.keys())
-
             for key in defaults:
                 if not key in params:
                     params[key] = defaults[key]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120412/27978599/attachment-0001.html>


More information about the calendarserver-changes mailing list