Changeset 1536

Timestamp:

12/20/06 03:58:21

Author:

fumanchu

Message:

Moved check_compatibility into _cpchecker.py. Also allow disabling of Checker methods by setting them to None.

Files:

• trunk/cherrypy/_cpchecker.py (modified) (2 diffs)
• trunk/cherrypy/_cpconfig.py (modified) (1 diff)
• trunk/cherrypy/test/checkerdemo.py (modified) (1 diff)

trunk/cherrypy/_cpchecker.py

@@ -16 +16 @@
-                if name.startswith("check_"):
-                    method = getattr(self, name)
-
+
+
-        finally:
-            warnings.formatwarning = oldformatwarning
@@ -79 +80 @@
-                        warnings.warn("%s\nsection: [%s]\nroot: %r\ndir: %r"
-                                      % (msg, section, root, dir))
+    
+    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 _compat(self, config):
+        """Process config and warn on each obsolete or deprecated entry."""
+        for section, conf in config.iteritems():
+            if isinstance(conf, dict):
+                for k, v in conf.iteritems():
+                    if k in self.obsolete:
+                        warnings.warn("%r is obsolete. Use %r instead.\n"
+                                      "section: [%s]" % (k, v, section))
+                    elif k in self.deprecated:
+                        warnings.warn("%r is deprecated. Use %r instead.\n"
+                                      "section: [%s]" % (k, v, section))
+            else:
+                if section in self.obsolete:
+                    warnings.warn("%r is obsolete. Use %r instead." % (section, conf))
+                elif section in self.deprecated:
+                    warnings.warn("%r is deprecated. Use %r instead." % (section, conf))
+    
+    def check_compatibility(self):
+        """Process config and warn on each obsolete or deprecated entry."""
+        self._compat(cherrypy.config)
+        for sn, app in cherrypy.tree.apps.iteritems():
+            self._compat(app.config)
-

trunk/cherrypy/_cpconfig.py

@@ -249 +249 @@
-
-
-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))
-
-
-class _Parser(ConfigParser.ConfigParser):

trunk/cherrypy/test/checkerdemo.py

@@ -14 +14 @@
-
-if __name__ == '__main__':
-
+
+
+
+
-            # This entry should be OK.
-            '/base/static': {'tools.staticdir.on': True,