Changeset 900

Timestamp:

12/30/05 01:04:41

Author:

fumanchu

Message:

Fix for #402 (staticfilter errors if .on but no .file nor .dir).

Files:

• trunk/cherrypy/filters/staticfilter.py (modified) (1 diff)
• trunk/cherrypy/test/test_static_filter.py (modified) (2 diffs)

trunk/cherrypy/filters/staticfilter.py

@@ -27 +27 @@
-        if not filename:
-            staticDir = config.get('static_filter.dir')
+            if not staticDir:
+                msg = ("StaticFilter requires either static_filter.file "
+                       "or static_filter.dir (%s)" % request.path)
+                raise cherrypy.WrongConfigValue(msg)
-            section = config.get('static_filter.dir', return_section=True)
-            if section == 'global':

trunk/cherrypy/test/test_static_filter.py

@@ -45 +45 @@
-        'static_filter.dir': 'static',
-        'static_filter.index': 'index.html',
+    },
+    '/error': {
+        'static_filter.on': True,
+        'server.show_tracebacks': True,
-    },
-})
@@ -100 +104 @@
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
+        
+        # Check that we get a WrongConfigValue error if no .file or .dir
+        self.getPage("/error/thing.html")
+        self.assertErrorPage(500)
+        self.assertInBody("WrongConfigValue: StaticFilter requires either "
+                          "static_filter.file or static_filter.dir "
+                          "(/error/thing.html)")
-
-