[CalendarServer-changes] [5064] CalendarServer/trunk/twistedcaldav/directory

[source_changes at macosforge.org]

Revision: 5064
          http://trac.macosforge.org/projects/calendarserver/changeset/5064
Author:   wsanchez at apple.com
Date:     2010-02-08 17:00:57 -0800 (Mon, 08 Feb 2010)
Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_cachedirectory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_resources.py
    CalendarServer/trunk/twistedcaldav/directory/xmlfile.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_cachedirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_cachedirectory.py	2010-02-08 23:16:30 UTC (rev 5063)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_cachedirectory.py	2010-02-09 01:00:57 UTC (rev 5064)
@@ -14,14 +14,16 @@
 # limitations under the License.
 ##
 
-from twistedcaldav.directory.cachingdirectory import CachingDirectoryService,\
-    CachingDirectoryRecord, DictRecordTypeCache
-from twistedcaldav.test.util import TestCase
+from uuid import uuid4
+
+from twistedcaldav.directory.cachingdirectory import CachingDirectoryService
+from twistedcaldav.directory.cachingdirectory import CachingDirectoryRecord
 from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.directory.util import uuidFromName
-from uuid import uuid4
 from twistedcaldav.directory.augment import AugmentRecord
+from twistedcaldav.test.util import TestCase
 
+
 class TestDirectoryService (CachingDirectoryService):
 
     realmName = "Dummy Realm"

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_resources.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_resources.py	2010-02-08 23:16:30 UTC (rev 5063)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_resources.py	2010-02-09 01:00:57 UTC (rev 5064)
@@ -37,8 +37,9 @@
 
         super(ResourcesTestCase, self).setUp()
 
-    def test_loadConfig(self):
-        directory = getDirectory()
+# Uh, what's this testing?
+#    def test_loadConfig(self):
+#        directory = getDirectory()
 
     def test_recordInPrimaryDirectory(self):
         directory = getDirectory()

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlfile.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2010-02-08 23:16:30 UTC (rev 5063)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlfile.py	2010-02-09 01:00:57 UTC (rev 5064)
@@ -88,14 +88,14 @@
             try:
                 uid = pwd.getpwnam(config.UserName).pw_uid
             except KeyError:
-                log.error("User not found: %s" % (config.UserName,))
+                self.log_error("User not found: %s" % (config.UserName,))
 
         gid = -1
         if config.GroupName:
             try:
                 gid = grp.getgrnam(config.GroupName).gr_gid
             except KeyError:
-                log.error("Group not found: %s" % (config.GroupName,))
+                self.log_error("Group not found: %s" % (config.GroupName,))
 
         if uid != -1 and gid != -1:
             os.chown(xmlFile.path, uid, gid)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100208/d66a9ae0/attachment.html>