Changeset 1732

Timestamp:

09/28/07 18:53:38

Author:

fumanchu

Message:

Port to trunk of [1706] and [1714].

Files:

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

trunk/cherrypy/_cpchecker.py

@@ -49 +49 @@
-    def check_skipped_app_config(self):
-        for sn, app in cherrypy.tree.apps.iteritems():
+            if not isinstance(app, cherrypy.Application):
+                continue
-            if not app.config:
-                msg = "The Application mounted at %r has an empty config." % sn
@@ -64 +66 @@
-        request = cherrypy.request
-        for sn, app in cherrypy.tree.apps.iteritems():
+            if not isinstance(app, cherrypy.Application):
+                continue
-            request.app = app
-            for section in app.config:
@@ -150 +154 @@
-        self._compat(cherrypy.config)
-        for sn, app in cherrypy.tree.apps.iteritems():
+            if not isinstance(app, cherrypy.Application):
+                continue
-            self._compat(app.config)
-    
@@ -171 +177 @@
-                    if len(atoms) > 1:
-                        if atoms[0] not in ns:
+                            # Spit out a special warning if a known
+                            # namespace is preceded by "cherrypy."
-                            if (atoms[0] == "cherrypy" and atoms[1] in ns):
-                                msg = ("The config entry %r is invalid; "
@@ -180 +188 @@
-                                       "section: [%s]" % (k, atoms[0], section))
-                            warnings.warn(msg)
+                        elif atoms[0] == "tools":
+                            if atoms[1] not in dir(cherrypy.tools):
+                                msg = ("The config entry %r may be invalid, "
+                                       "because the %r tool was not found.\n"
+                                       "section: [%s]" % (k, atoms[1], section))
+                                warnings.warn(msg)
-    
-    def check_config_namespaces(self):
-        """Process config and warn on each unknown config namespace."""
-        for sn, app in cherrypy.tree.apps.iteritems():
+            if not isinstance(app, cherrypy.Application):
+                continue
-            self._known_ns(app)
+
+
-    
-    
@@ -234 +252 @@
-        self._known_types(cherrypy.config)
-        for sn, app in cherrypy.tree.apps.iteritems():
+            if not isinstance(app, cherrypy.Application):
+                continue
-            self._known_types(app.config)
-    

trunk/cherrypy/test/checkerdemo.py

@@ -36 +36 @@
-            # Warn on mismatched types
-            '/conftype': {'request.show_tracebacks': 14},
+            # Warn on unknown tool.
+            '/web': {'tools.unknown.on': True},
-            # Warn on 'localhost'
-            'global': {'server.socket_host': 'localhost'},