[CalendarServer-changes] [2180] CalendarServer/trunk/twistedcaldav/config.py

[source_changes at macosforge.org]

Revision: 2180
          http://trac.macosforge.org/projects/calendarserver/changeset/2180
Author:   wsanchez at apple.com
Date:     2008-02-25 16:40:08 -0800 (Mon, 25 Feb 2008)

Log Message:
-----------
No need to distinguish between obsolete and unknown, really.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2008-02-26 00:36:22 UTC (rev 2179)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-02-26 00:40:08 UTC (rev 2180)
@@ -272,8 +272,8 @@
 def _cleanup(configDict):
     cleanDict = copy.deepcopy(configDict)
 
-    def obsolete(key, reason="obsolete"):
-        log.err("Ignoring %s configuration option: %r" % (reason, key))
+    def unknown(key):
+        log.err("Ignoring unknown configuration option: %r" % (key,))
         del cleanDict[key]
 
     def deprecated(oldKey, newKey):
@@ -284,18 +284,6 @@
         cleanDict[newKey] = configDict[oldKey]
         del cleanDict[oldKey]
 
-    obsoleteOptions = (
-        "BindAddress",
-        "CalendarUserProxyEnabled",
-        "DropBoxEnabled",
-        "MaximumAttachmentSizeBytes",
-        "NotificationsEnabled",
-        "SACLEnable",
-        "ServerLogFile",
-        "ServerType",
-        "UserQuotaBytes",
-    )
-
     renamedOptions = {
 #       "BindAddress": "BindAddresses",
     }
@@ -304,9 +292,6 @@
         if key in defaultConfig:
             continue
 
-        elif key in obsoleteOptions:
-            obsolete(key)
-
         elif key in renamedOptions:
             renamed(key, renamedOptions[key])
 
@@ -318,7 +303,7 @@
 #           del cleanDict["pydirConfig"]
 
         else:
-            obsolete(key, reason="unknown")
+            unknown(key,)
 
     return cleanDict
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080225/92e57844/attachment.html