Changeset 1373

Timestamp:

09/22/06 20:26:45

Author:

fumanchu

Message:

New _cpconfig.check_compatibility function.

Files:

• trunk/cherrypy/_cpconfig.py (modified) (3 diffs)

trunk/cherrypy/_cpconfig.py

@@ -78 +78 @@
-
-import ConfigParser
+from warnings import warn
+
-import cherrypy
-
@@ -101 +103 @@
-    }
-
+def as_dict(config):
+    """Return a dict from 'config' whether it is a dict, file, or filename."""
+    if isinstance(config, basestring):
+        config = _Parser().dict_from_file(config)
+    elif hasattr(config, 'read'):
+        config = _Parser().dict_from_file(config)
+    return config
+
-def merge(base, other):
-
+
+
+
+
+
-    if isinstance(other, basestring):
-        if other not in cherrypy.engine.reload_files:
-            cherrypy.engine.reload_files.append(other)
-        other = _Parser().dict_from_file(other)
-    elif hasattr(other, 'read'):
-        other = _Parser().dict_from_file(other)
-    
-    # Load other into base
-other
+as_dict(other)
-        base.setdefault(section, {}).update(value_map)
-
@@ -174 +185 @@
-        if namespace in self.namespaces:
-            self.namespaces[namespace](atoms[1], v)
+
+
+obsolete = {
+    'server.default_content_type': 'tools.response_headers.headers',
+    'log_access_file': 'log.access_file',
+    'log_config_options': None,
+    'log_file': 'log.error_file',
+    'log_file_not_found': None,
+    'log_request_headers': 'tools.log_headers.on',
+    'log_to_screen': 'log.screen',
+    'show_tracebacks': 'request.show_tracebacks',
+    'throw_errors': 'request.throw_errors',
+    'profiler.on': 'cherrypy.tree.mount(profiler.make_app(cherrypy.Application(Root())))',
+    }
+
+deprecated = {}
+
+def check_compatibility(config):
+    """Process config and warn on each obsolete or deprecated entry."""
+    for section, map in as_dict(config).iteritems():
+        if isinstance(map, dict):
+            for k, v in map.iteritems():
+                if k in obsolete:
+                    warn("%r is obsolete. Use %r instead." % (k, v))
+                elif k in deprecated:
+                    warn("%r is deprecated. Use %r instead." % (k, v))
+        else:
+            if section in obsolete:
+                warn("%r is obsolete. Use %r instead." % (section, map))
+            elif section in deprecated:
+                warn("%r is deprecated. Use %r instead." % (section, map))
-
-