[CalendarServer-changes] [3805] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3805
          http://trac.macosforge.org/projects/calendarserver/changeset/3805
Author:   wsanchez at apple.com
Date:     2009-03-10 12:40:10 -0700 (Tue, 10 Mar 2009)
Log Message:
-----------
pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/migrate.py
    CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
    CalendarServer/trunk/twistedcaldav/resource.py
    CalendarServer/trunk/twistedcaldav/test/test_config.py
    CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
    CalendarServer/trunk/twistedcaldav/upgrade.py

Modified: CalendarServer/trunk/calendarserver/tools/migrate.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/migrate.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/calendarserver/tools/migrate.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -28,7 +28,6 @@
 import os
 import sys
 from getopt import getopt, GetoptError
-from os.path import dirname, abspath
 
 from twistedcaldav.upgrade import upgradeData
 from calendarserver.tools.util import loadConfig

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -39,7 +39,6 @@
 from twisted.internet.threads import deferToThread
 from twisted.cred.credentials import UsernamePassword
 from twisted.web2.auth.digest import DigestedCredentials
-from twisted.internet.defer import succeed, returnValue
 
 from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
 from twistedcaldav.directory.directory import DirectoryError, UnknownRecordTypeError

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -59,10 +59,8 @@
 from twistedcaldav.ical import allowedComponents
 from twistedcaldav.ical import Component as iComponent
 from twistedcaldav.log import LoggingMixIn
-from twistedcaldav.scheduling.cuaddress import normalizeCUAddr
 
 from urlparse import urlsplit
-import itertools
 
 if twistedcaldav.__version__:
     serverVersion = twisted.web2.server.VERSION + " TwistedCalDAV/" + twistedcaldav.__version__

Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_config.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -17,7 +17,7 @@
 from twext.python.plistlib import writePlist
 
 from twistedcaldav.log import logLevelForNamespace
-from twistedcaldav.config import config, defaultConfig, ConfigurationError
+from twistedcaldav.config import config, defaultConfig
 from twistedcaldav.static import CalDAVFile
 from twistedcaldav.test.util import TestCase
 
@@ -175,13 +175,6 @@
         self.assertEquals(config.DirectoryService.params.restrictEnabledRecords, True)
         self.assertEquals(config.DirectoryService.params.restrictToGroup, "12345")
 
-    def testDirectoryService_badParam(self):
-        self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.xmlfile.XMLDirectoryService")
-        self.assertEquals(config.DirectoryService.params.xmlFile, "/etc/caldavd/accounts.xml")
-
-        # Unrecognized params no longer raise an exception
-        # self.assertRaises(ConfigurationError, config.update, {"DirectoryService": {"params": {"restrictEnabledRecords": False}}})
-
     def testDirectoryService_unknownType(self):
         self.assertEquals(config.DirectoryService.type, "twistedcaldav.directory.xmlfile.XMLDirectoryService")
         self.assertEquals(config.DirectoryService.params.xmlFile, "/etc/caldavd/accounts.xml")

Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -16,9 +16,7 @@
 
 from twistedcaldav.config import config
 from twistedcaldav.directory.calendaruserproxy import CalendarUserProxyDatabase
-from twistedcaldav.upgrade import (
-    UpgradeError, upgradeData, updateFreeBusySet, updateFreeBusyHref
-)
+from twistedcaldav.upgrade import UpgradeError, upgradeData, updateFreeBusySet
 from twistedcaldav.test.util import TestCase
 from calendarserver.tools.util import getDirectory
 from twisted.web2.dav import davxml

Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py	2009-03-10 19:31:36 UTC (rev 3804)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py	2009-03-10 19:40:10 UTC (rev 3805)
@@ -22,12 +22,11 @@
 from twistedcaldav.directory.calendaruserproxy import CalendarUserProxyDatabase
 from twistedcaldav.log import Logger
 from twistedcaldav.ical import Component
-from twistedcaldav.scheduling.cuaddress import normalizeCUAddr
 from twistedcaldav import caldavxml
-from calendarserver.tools.util import getDirectory, dummyDirectoryRecord
-import xattr, itertools, os, zlib, hashlib, datetime, pwd, grp
-from zlib import compress, decompress
-from cPickle import loads as unpickle, PicklingError, UnpicklingError
+from calendarserver.tools.util import getDirectory
+import xattr, os, zlib, hashlib, datetime, pwd, grp
+from zlib import compress
+from cPickle import loads as unpickle, UnpicklingError
 
 
 log = Logger()
@@ -401,7 +400,7 @@
         try:
             freeBusySet = unpickle(value)
         except UnpicklingError:
-            log.err("Invalid xattr property value for: %s" % attr)
+            log.err("Invalid free/busy property value")
             # MOR: continue on?
             return None
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090310/26568581/attachment.html>