[CalendarServer-changes] [3259] CalendarServer/trunk/twistedcaldav/directory/sudo.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Oct 29 11:10:28 PDT 2008
Revision: 3259
http://trac.macosforge.org/projects/calendarserver/changeset/3259
Author: wsanchez at apple.com
Date: 2008-10-29 11:10:28 -0700 (Wed, 29 Oct 2008)
Log Message:
-----------
Missed an import
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/sudo.py
Modified: CalendarServer/trunk/twistedcaldav/directory/sudo.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/sudo.py 2008-10-29 18:08:04 UTC (rev 3258)
+++ CalendarServer/trunk/twistedcaldav/directory/sudo.py 2008-10-29 18:10:28 UTC (rev 3259)
@@ -23,16 +23,17 @@
"SudoDirectoryService",
]
+try:
+ from plistlib import readPlist
+except ImportError:
+ from twistedcaldav.py.plistlib import readPlist
+
from twisted.python.filepath import FilePath
-
-from twisted.cred.credentials import (IUsernamePassword,
- IUsernameHashedPassword)
-
+from twisted.cred.credentials import IUsernamePassword, IUsernameHashedPassword
from twisted.cred.error import UnauthorizedLogin
-from twistedcaldav.directory.directory import (DirectoryService,
- DirectoryRecord,
- UnknownRecordTypeError)
+from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav.directory.directory import UnknownRecordTypeError
class SudoDirectoryService(DirectoryService):
"""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081029/fd8dd71e/attachment.html>
More information about the calendarserver-changes
mailing list