Revision: 1466 http://trac.macosforge.org/projects/calendarserver/changeset/1466 Author: wsanchez@apple.com Date: 2007-04-10 19:38:12 -0700 (Tue, 10 Apr 2007) Log Message: ----------- Missing import Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-04-10 20:12:32 UTC (rev 1465) +++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py 2007-04-11 02:38:12 UTC (rev 1466) @@ -32,8 +32,8 @@ import dsquery from twisted.python import log +from twisted.internet.reactor import callLater from twisted.internet.threads import deferToThread -from twisted.internet.reactor import callLater from twisted.cred.credentials import UsernamePassword from twisted.web2.auth.digest import DigestedCredentials @@ -532,7 +532,7 @@ try: return opendirectory.authenticateUserBasic(self.service.directory, self.guid, self.shortName, credentials.password) except opendirectory.ODError, e: - log.err("Open Directory (node=%s) error while performing basic authentication for user %s: %r" + log.err("Open Directory (node=%s) error while performing basic authentication for user %s: %s" % (self.service.realmName, self.shortName, e)) return False elif isinstance(credentials, DigestedCredentials): @@ -557,7 +557,7 @@ credentials.method ) except opendirectory.ODError, e: - log.err("Open Directory (node=%s) error while performing digest authentication for user %s: %r" + log.err("Open Directory (node=%s) error while performing digest authentication for user %s: %s" % (self.service.realmName, self.shortName, e)) return False