[785] CalendarServer/trunk/twistedcaldav

9 Dec 2006

Revision: 785
          http://trac.macosforge.org/projects/calendarserver/changeset/785
Author:   wsanchez@apple.com
Date:     2006-12-08 22:52:06 -0800 (Fri, 08 Dec 2006)

Log Message:
-----------
Cosmetic, pyflakes

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/admin/options.py
    CalendarServer/trunk/twistedcaldav/admin/purge.py
    CalendarServer/trunk/twistedcaldav/admin/script.py
    CalendarServer/trunk/twistedcaldav/admin/stats.py
    CalendarServer/trunk/twistedcaldav/backup.py
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/directory/aggregate.py
    CalendarServer/trunk/twistedcaldav/directory/directory.py
    CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py
    CalendarServer/trunk/twistedcaldav/directory/test/util.py
    CalendarServer/trunk/twistedcaldav/root.py
    CalendarServer/trunk/twistedcaldav/tap.py
    CalendarServer/trunk/twistedcaldav/test/test_config.py

Modified: CalendarServer/trunk/twistedcaldav/admin/options.py
===================================================================

--- CalendarServer/trunk/twistedcaldav/admin/options.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/admin/options.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -91,7 +91,7 @@
 
 
 from twisted.python import filepath
-from twistedcaldav import config
+from twistedcaldav.config import config
 
 class LogOptions(SubCommand):
     name = 'logs'

Modified: CalendarServer/trunk/twistedcaldav/admin/purge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/purge.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/admin/purge.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -16,10 +16,8 @@
 # DRI: David Reid, dreid@apple.com
 ##
 
-import os
+import datetime
 
-import datetime, dateutil.tz
-
 def purgeEvents(collection, purgeDate):
     """
     Recursively purge all events older than purgeDate.

Modified: CalendarServer/trunk/twistedcaldav/admin/script.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/script.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/admin/script.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -33,22 +33,20 @@
 from twisted.python import usage
 from twisted.python import filepath
 
-from plistlib import readPlist
-
 from twistedcaldav.admin import options
 from twistedcaldav.admin import formatters
 
-from twistedcaldav import config
+from twistedcaldav.config import config
 
 class AdminOptions(usage.Options):
     recursing = 0
     params = ()
 
     optParameters = [
-        ['config', 'c', config.DEFAULTPLISTFILE, "Path to the caldavd.plist"],
+        ['config', 'c', config.defaultConfigFile, "Path to the caldavd.plist"],
         ['format', 'f', 'plain', ("Select an appropriate output formatter: "
                                   "%s" % (formatters.listFormatters(),))]
-        ]
+    ]
 
     def __init__(self):
         usage.Options.__init__(self)
@@ -95,8 +93,7 @@
             self.formatter = formatters.getFormatter(self['format'])
             self.formatter = self.formatter(options=self.format_options)
         else:
-            raise usage.UsageError("Please specify a valid formatter: %s" % (
-                    ', '.join(lf)))
+            raise usage.UsageError("Please specify a valid formatter")
         
         self.subCommands = options.genSubCommandsDef()
         self.recursing = 1
@@ -105,8 +102,7 @@
         sc = options.listCommands()
 
         if self.subCommand not in sc:
-            raise usage.UsageError("Please select one of: %s" % (
-                    ', '.join(sorted(sc))))
+            raise usage.UsageError("Please select one of: %s" % (', '.join(sorted(sc))))
 
     
 def run():

Modified: CalendarServer/trunk/twistedcaldav/admin/stats.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/stats.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/admin/stats.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -25,14 +25,6 @@
   # of events
 
 """
-import os
-import xattr
-import commands
-
-from twisted.web import microdom
-
-from twistedcaldav import ical
-
 from twistedcaldav.admin import util        
 
 class StatsAction(object):

Modified: CalendarServer/trunk/twistedcaldav/backup.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/backup.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/backup.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -24,7 +24,6 @@
 import shutil
 import fnmatch
 import plistlib
-import tempfile
 import commands
 
 VERBOSE = os.environ.get('VERBOSE', False)

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/config.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -20,13 +20,14 @@
 
 from twistedcaldav.py.plistlib import readPlist
 
-DEFAULTPLISTFILE = '/etc/caldavd/caldavd.plist'
+defaultConfigFile = '/etc/caldavd/caldavd.plist'
 
-DEFAULTS = {
+defaults = {
     'CreateAccounts': False,
     'DirectoryService': {
         'params': {'node': '/Search'},
-        'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService'},
+        'type': 'twistedcaldav.directory.appleopendirectory.OpenDirectoryService'
+    },
     'DocumentRoot': '/Library/CalendarServer/Documents',
     'DropBoxEnabled': True,
     'DropBoxInheritedACLs': True,
@@ -56,14 +57,9 @@
     'AdminPrincipals': ['/principal/users/admin']
 }
 
-globs = globals()
-globs.update(DEFAULTS.copy())
+config = dict(defaults)
 
 def parseConfig(configFile):
-    global globs
     if os.path.exists(configFile):
         plist = readPlist(configFile)
-        globs.update(plist)
-
-
-    
+        config.update(plist)

Modified: CalendarServer/trunk/twistedcaldav/directory/aggregate.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/directory/aggregate.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -27,11 +27,9 @@
 ]
 
 from twistedcaldav.directory.idirectory import IDirectoryService
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, DirectoryError
+from twistedcaldav.directory.directory import DirectoryService, DirectoryError
 from twistedcaldav.directory.directory import UnknownRecordTypeError
 
-import twistedcaldav.directory.test.util
-
 class AggregateDirectoryService(DirectoryService):
     """
     L{IDirectoryService} implementation which aggregates multiple directory services.
@@ -79,7 +77,7 @@
         return self._query("recordWithShortName", recordType, shortName)
 
     def recordWithGUID(self, guid):
-        return self._queryAll("recordWithGUID", address)
+        return self._queryAll("recordWithGUID", guid)
 
     def recordWithCalendarUserAddress(self, address):
         return self._queryAll("recordWithCalendarUserAddress", address)

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -29,7 +29,6 @@
 ]
 
 import sys
-from urllib import quote
 
 from zope.interface import implements
 

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_aggregate.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -16,8 +16,6 @@
 # DRI: Wilfredo Sanchez, wsanchez@apple.com
 ##
 
-from itertools import chain
-
 from twistedcaldav.directory.apache import BasicDirectoryService
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.aggregate import AggregateDirectoryService

Modified: CalendarServer/trunk/twistedcaldav/directory/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/directory/test/util.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -16,8 +16,6 @@
 # DRI: Wilfredo Sanchez, wsanchez@apple.com
 ##
 
-from urllib import quote
-
 import twisted.trial.unittest
 from twisted.trial.unittest import SkipTest
 from twisted.cred.credentials import UsernamePassword

Modified: CalendarServer/trunk/twistedcaldav/root.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/root.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/root.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -26,6 +26,7 @@
 from twisted.web2.dav import davxml
 from twisted.web2.dav.static import DAVFile
 
+from twistedcaldav.config import config
 
 class RootResource(DAVFile):
     """
@@ -38,8 +39,6 @@
     def __init__(self, path, *args, **kwargs):
         super(RootResource, self).__init__(path, *args, **kwargs)
         
-        from twistedcaldav import config
-
         if config.SACLEnable and RootResource.CheckSACL:
             self.useSacls = True
 

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -39,7 +39,7 @@
 from twisted.web2.log import LogWrapperResource
 from twisted.web2.server import Site
 
-from twistedcaldav import config
+from twistedcaldav.config import config
 from twistedcaldav.logging import RotatingFileAccessLoggingObserver
 from twistedcaldav.root import RootResource
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource

Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_config.py	2006-12-09 06:30:19 UTC (rev 784)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py	2006-12-09 06:52:06 UTC (rev 785)
@@ -18,7 +18,7 @@
 
 from twisted.trial import unittest
 
-from twistedcaldav import config
+from twistedcaldav.config import config
 
 testConfig = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -37,7 +37,7 @@
         open(self.testConfig, 'w').write(testConfig)
 
     def testDefaults(self):
-        for key, value in config.DEFAULTS.iteritems():
+        for key, value in config.defaults.iteritems():
             self.failUnless(key in config.__dict__)
             self.assertEquals(config.__dict__[key], value)
 
@@ -50,7 +50,6 @@
     
     def testScoping(self):
         def getVerbose():
-            from twistedcaldav import config
             self.assertEquals(config.Verbose, True)
 
         self.assertEquals(config.Verbose, False)

    

source_changes＠macosforge.org

tags

participants (1)