[CalendarServer-changes] [520] CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav

[source_changes at macosforge.org]

Revision: 520
          http://trac.macosforge.org/projects/calendarserver/changeset/520
Author:   cdaboo at apple.com
Date:     2006-11-20 07:17:41 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
Fix imports, minor clean-up.

Modified Paths:
--------------
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/__init__.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/__init__.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py
    CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/__init__.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/__init__.py	2006-11-18 00:58:58 UTC (rev 519)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/__init__.py	2006-11-20 15:17:41 UTC (rev 520)
@@ -36,6 +36,7 @@
     "instance",
     "principalindex",
     "resource",
+    "sql",
     "static",
 ]
 

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/__init__.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/__init__.py	2006-11-18 00:58:58 UTC (rev 519)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/__init__.py	2006-11-20 15:17:41 UTC (rev 520)
@@ -26,4 +26,7 @@
     "directory",
     "idirectory",
     "resource",
+    "sqldb",
+    "xmlaccounrsparser",
+    "xmlfile",
 ]

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py	2006-11-18 00:58:58 UTC (rev 519)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/directory.py	2006-11-20 15:17:41 UTC (rev 520)
@@ -105,7 +105,7 @@
     def groups(self):
         return ()
 
-    def verifyCredentials(credentials):
+    def verifyCredentials(self, credentials):
         return False
 
 class DirectoryError(RuntimeError):

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py	2006-11-18 00:58:58 UTC (rev 519)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/sqldb.py	2006-11-20 15:17:41 UTC (rev 520)
@@ -15,7 +15,6 @@
 #
 # DRI: Cyrus Daboo, cdaboo at apple.com
 ##
-from twistedcaldav.sql import AbstractSQLDatabase
 
 
 """
@@ -48,6 +47,7 @@
 
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
 from twistedcaldav.directory.xmlaccountsparser import XMLAccountsParser
+from twistedcaldav.sql import AbstractSQLDatabase
 
 import os
 

Modified: CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py	2006-11-18 00:58:58 UTC (rev 519)
+++ CalendarServer/branches/users/wsanchez/provisioning-2/twistedcaldav/directory/xmlfile.py	2006-11-20 15:17:41 UTC (rev 520)
@@ -15,7 +15,6 @@
 #
 # DRI: Cyrus Daboo, cdaboo at apple.com
 ##
-from twistedcaldav.directory.xmlaccountsparser import XMLAccountsParser
 
 """
 XML based user/group/resource directory service implementation.
@@ -30,6 +29,7 @@
 from twisted.python.filepath import FilePath
 
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav.directory.xmlaccountsparser import XMLAccountsParser
 
 class XMLDirectoryService(DirectoryService):
     """

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061120/5077472f/attachment.html