[CalendarServer-changes] [6719] CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory .py

[source_changes at macosforge.org]

Revision: 6719
          http://trac.macosforge.org/projects/calendarserver/changeset/6719
Author:   wsanchez at apple.com
Date:     2011-01-06 14:36:44 -0800 (Thu, 06 Jan 2011)
Log Message:
-----------
cosmetic

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2011-01-06 21:58:58 UTC (rev 6718)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_opendirectory.py	2011-01-06 22:36:44 UTC (rev 6719)
@@ -20,10 +20,10 @@
     pass
 else:
     from twisted.trial.unittest import SkipTest
-    import twext.web2.auth.digest
+    from twisted.internet.defer import inlineCallbacks
+    from twext.web2.auth.digest import DigestedCredentials
     import twistedcaldav.directory.test.util
     from twistedcaldav.directory import augment
-    from twisted.internet.defer import inlineCallbacks
     from twistedcaldav.directory.directory import DirectoryService
     from twistedcaldav.directory.appleopendirectory import OpenDirectoryRecord
     from calendarserver.platform.darwin.od import dsattributes
@@ -97,7 +97,7 @@
             )
 
             digestFields = {}
-            digested = twext.web2.auth.digest.DigestedCredentials("user", "GET", "example.com", digestFields, None)
+            digested = DigestedCredentials("user", "GET", "example.com", digestFields, None)
 
             self.assertFalse(record.verifyCredentials(digested))
 
@@ -136,7 +136,7 @@
 
             record.digestcache = {}
             record.digestcache["/"] = response
-            digested = twext.web2.auth.digest.DigestedCredentials("user", "GET", "example.com", digestFields, None)
+            digested = DigestedCredentials("user", "GET", "example.com", digestFields, None)
 
             self.assertTrue(record.verifyCredentials(digested))
 
@@ -451,4 +451,10 @@
         def setUp(self):
             super(OpenDirectorySubset, self).setUp()
             augment.AugmentService = augment.AugmentXMLDB(xmlFiles=())
-            self._service = OpenDirectoryService({'node' : "/Search", 'recordTypes' : (DirectoryService.recordType_users, DirectoryService.recordType_groups)}, dosetup=False)
+            self._service = OpenDirectoryService(
+                {
+                    "node" : "/Search",
+                    "recordTypes" : (DirectoryService.recordType_users, DirectoryService.recordType_groups),
+                },
+                dosetup = False
+            )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110106/45c66531/attachment-0001.html>