Changeset 891

Timestamp:

12/28/05 21:13:13

Author:

fumanchu

Message:

Fix for #394 (custom filters). Well, it fixes a related problem, anyway. ;) The real fix for #394 is "don't do that".

Files:

• trunk/cherrypy/filters/__init__.py (modified) (3 diffs)
• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (3 diffs)
• trunk/cherrypy/test/test_custom_filters.py (added)

trunk/cherrypy/filters/__init__.py

@@ -2 +2 @@
-from cherrypy import _cputil
-
+
-# These are in order for a reason!
-# They must be strings matching keys in classMap
-_input_order = [
-'CacheFilter'
-'LogDebugInfoFilter'
-'BaseUrlFilter'
-'VirtualHostFilter'
-'DecodingFilter'
-'SessionFilter'
-'SessionAuthenticateFilter'
-'StaticFilter'
-'NsgmlsFilter'
-'TidyFilter'
-'XmlRpcFilter'
+"cherrypy.filters.cachefilter.CacheFilter"
+"cherrypy.filters.logdebuginfofilter.LogDebugInfoFilter"
+"cherrypy.filters.baseurlfilter.BaseUrlFilter"
+"cherrypy.filters.virtualhostfilter.VirtualHostFilter"
+"cherrypy.filters.decodingfilter.DecodingFilter"
+"cherrypy.filters.sessionfilter.SessionFilter"
+"cherrypy.filters.sessionauthenticatefilter.SessionAuthenticateFilter"
+"cherrypy.filters.staticfilter.StaticFilter"
+"cherrypy.filters.nsgmlsfilter.NsgmlsFilter"
+"cherrypy.filters.tidyfilter.TidyFilter"
+"cherrypy.filters.xmlrpcfilter.XmlRpcFilter"
-]
-
-_output_order = [
-'ResponseHeadersFilter'
-'XmlRpcFilter'
-'EncodingFilter'
-'TidyFilter'
-'NsgmlsFilter'
-'LogDebugInfoFilter'
-'GzipFilter'
-'SessionFilter'
-'CacheFilter'
+"cherrypy.filters.responseheadersfilter.ResponseHeadersFilter"
+"cherrypy.filters.xmlrpcfilter.XmlRpcFilter"
+"cherrypy.filters.encodingfilter.EncodingFilter"
+"cherrypy.filters.tidyfilter.TidyFilter"
+"cherrypy.filters.nsgmlsfilter.NsgmlsFilter"
+"cherrypy.filters.logdebuginfofilter.LogDebugInfoFilter"
+"cherrypy.filters.gzipfilter.GzipFilter"
+"cherrypy.filters.sessionfilter.SessionFilter"
+"cherrypy.filters.cachefilter.CacheFilter"
-]
-
@@ -45 +45 @@
-}
-
+
-def init():
-    """Initialize the filters."""
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    
-    instances = {}
@@ -78 +55 @@
-    conf = cherrypy.config.get
-    
-
-
+cls
+cls
-        if f is None:
-
+
+
-        inputs.append(f)
-    
-
-
+cls
+cls
-        if f is None:
-
+
+
-        outputs.append(f)
-    

trunk/cherrypy/test/test.py

@@ -318 +318 @@
-        'test_config',
-        'test_core',
+        'test_custom_filters',
-        'test_decodingencoding_filter',
-        'test_gzip_filter',

trunk/cherrypy/test/test_core.py

@@ -326 +326 @@
-
-
-class NadsatFilter:
-    
-    def before_finalize(self):
-        self.ended = False
-        def nadsat_it_up(body):
-            for chunk in body:
-                chunk = chunk.replace("good", "horrorshow")
-                chunk = chunk.replace("piece", "lomtick")
-                yield chunk
-        cherrypy.response.body = nadsat_it_up(cherrypy.response.body)
-    
-    def on_end_request(self):
-        # This runs after the request has been completely written out.
-        cherrypy.response.body = "razdrez"
-        self.ended = True
-
-_nf = NadsatFilter()
-
-class CPFilterList(Test):
-    
-    _cp_filters = [_nf]
-    
-    def index(self):
-        return "A good piece of cherry pie"
-    
-    def err(self):
-        raise ValueError()
-    
-    def errinstream(self):
-        raise ValueError()
-        yield "confidential"
-
-
-log_file = os.path.join(localDir, "error.log")
-log_access_file = os.path.join(localDir, "access.log")
@@ -399 +366 @@
-    '/error/rethrow': {
-        'server.throw_errors': True,
-    },
-    '/cpfilterlist/errinstream': {
-        'streamResponse': True,
-    },
-})
@@ -610 +574 @@
-        else:
-            self.assertBody("(['http://127.0.0.1:8000/'], 302)")
-    
-    def testCPFilterList(self):
-        self.getPage("/cpfilterlist/")
-        # If body is "razdrez", then on_end_request is being called too early.
-        self.assertBody("A horrorshow lomtick of cherry pie")
-        # If this fails, then on_end_request isn't being called at all.
-        self.assertEqual(_nf.ended, True)
-        
-        ignore = helper.webtest.ignored_exceptions
-        ignore.append(ValueError)
-        try:
-            valerr = '\n    raise ValueError()\nValueError'
-            self.getPage("/cpfilterlist/err")
-            # If body is "razdrez", then on_end_request is being called too early.
-            self.assertErrorPage(500, pattern=valerr)
-            # If this fails, then on_end_request isn't being called at all.
-            self.assertEqual(_nf.ended, True)
-            
-            # If body is "razdrez", then on_end_request is being called too early.
-            if cherrypy.server.httpserver is None:
-                self.assertRaises(ValueError, self.getPage,
-                                  "/cpfilterlist/errinstream")
-            else:
-                self.getPage("/cpfilterlist/errinstream")
-                # Because this error is raised after the response body has
-                # started, the status should not change to an error status.
-                self.assertStatus("200 OK")
-                self.assertBody("Unrecoverable error in the server.")
-            # If this fails, then on_end_request isn't being called at all.
-            self.assertEqual(_nf.ended, True)
-        finally:
-            ignore.pop()
-    
-    def testFlatten(self):