[CalendarServer-changes] [3442] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 3442
          http://trac.macosforge.org/projects/calendarserver/changeset/3442
Author:   wsanchez at apple.com
Date:     2008-12-02 14:17:03 -0800 (Tue, 02 Dec 2008)
Log Message:
-----------
Get rid of parseConfig()

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tap/caldav.py
    CalendarServer/trunk/twistedcaldav/admin/script.py
    CalendarServer/trunk/twistedcaldav/config.py
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/notify.py

Modified: CalendarServer/trunk/calendarserver/tap/caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/caldav.py	2008-12-02 22:13:51 UTC (rev 3441)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py	2008-12-02 22:17:03 UTC (rev 3442)
@@ -49,7 +49,7 @@
 from twistedcaldav.accesslog import RotatingFileAccessLoggingObserver
 from twistedcaldav.accesslog import AMPCommonAccessLoggingObserver
 from twistedcaldav.cluster import makeService_Combined, makeService_Master
-from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile, ConfigurationError
+from twistedcaldav.config import config, defaultConfig, defaultConfigFile, ConfigurationError
 from twistedcaldav.root import RootResource
 from twistedcaldav.resource import CalDAVResource
 from twistedcaldav.directory.digest import QopDigestCredentialFactory
@@ -178,7 +178,7 @@
                     % (self["config"],))
 
         log.info("Reading configuration from file: %s" % (self["config"],))
-        parseConfig(self["config"])
+        config.loadConfig(self["config"])
 
         config.updateDefaults(self.overrides)
 

Modified: CalendarServer/trunk/twistedcaldav/admin/script.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/admin/script.py	2008-12-02 22:13:51 UTC (rev 3441)
+++ CalendarServer/trunk/twistedcaldav/admin/script.py	2008-12-02 22:17:03 UTC (rev 3442)
@@ -34,7 +34,7 @@
 from twistedcaldav.admin import options
 from twistedcaldav.admin import formatters
 
-from twistedcaldav.config import defaultConfigFile, config, parseConfig
+from twistedcaldav.config import defaultConfigFile, config
 
 class AdminOptions(usage.Options):
     recursing = 0
@@ -81,7 +81,7 @@
         if self['config']:
             self['config'] = os.path.abspath(self['config'])
             if os.path.exists(self['config']):
-                parseConfig(self['config'])
+                config.loadConfig(self['config'])
 
         self.root = filepath.FilePath(config.DocumentRoot)
         self.calendarCollection = self.root.child('calendars')

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2008-12-02 22:13:51 UTC (rev 3441)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-12-02 22:17:03 UTC (rev 3442)
@@ -693,6 +693,3 @@
     """
 
 config = Config(defaultConfig)
-
-def parseConfig(configFile):
-    config.loadConfig(configFile)

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2008-12-02 22:13:51 UTC (rev 3441)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2008-12-02 22:17:03 UTC (rev 3442)
@@ -38,7 +38,7 @@
 from twisted.web2.http_headers import MimeType
 
 from twistedcaldav import ical, caldavxml
-from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile
+from twistedcaldav.config import config, defaultConfig, defaultConfigFile
 from twistedcaldav.ical import Property
 from twistedcaldav.log import Logger, LoggingMixIn
 from twistedcaldav.directory.util import NotFilePath
@@ -150,7 +150,7 @@
     opt_o = opt_option
 
     def postOptions(self):
-        parseConfig(self['config'])
+        config.loadConfig(self['config'])
         config.updateDefaults(self.overrides)
         self.parent['pidfile'] = None
 

Modified: CalendarServer/trunk/twistedcaldav/notify.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/notify.py	2008-12-02 22:13:51 UTC (rev 3441)
+++ CalendarServer/trunk/twistedcaldav/notify.py	2008-12-02 22:17:03 UTC (rev 3442)
@@ -49,7 +49,7 @@
 from twisted.words.protocols.jabber.xmlstream import IQ
 from twisted.words.xish import domish
 from twistedcaldav.log import LoggingMixIn
-from twistedcaldav.config import config, parseConfig, defaultConfig, defaultConfigFile
+from twistedcaldav.config import config, defaultConfig, defaultConfigFile
 from twistedcaldav.memcacher import Memcacher
 from twistedcaldav import memcachepool
 from zope.interface import Interface, implements
@@ -1263,7 +1263,7 @@
     opt_o = opt_option
 
     def postOptions(self):
-        parseConfig(self['config'])
+        config.loadConfig(self['config'])
         config.updateDefaults(self.overrides)
         self.parent['pidfile'] = None
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081202/9044873f/attachment-0001.html>