Changeset 1415

Timestamp:

10/27/06 13:14:09

Author:

fumanchu

Message:

Moved _cprequest.flattener to cherrypy.tools.flatten.

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)
• trunk/cherrypy/_cptools.py (modified) (1 diff)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)

trunk/cherrypy/_cprequest.py

@@ -540 +540 @@
-        elif isinstance(value, types.FileType):
-            value = file_generator(value)
-        elif isinstance(value, types.GeneratorType):
-            value = flattener(value)
-        elif value is None:
-            value = []
-        obj._body = value
-
-
-def flattener(input):
-    """Yield the given input, recursively iterating over each result (if needed)."""
-    for x in input:
-        if not isinstance(x, types.GeneratorType):
-            yield x
-        else:
-            for y in flattener(x):
-                yield y 
-
-

trunk/cherrypy/_cptools.py

@@ -322 +322 @@
-_d.digest_auth = Tool('on_start_resource', auth.digest_auth)
-_d.trailing_slash = Tool('before_handler', cptools.trailing_slash)
+_d.flatten = Tool('before_finalize', cptools.flatten)
-
-del _d, cptools, encoding, auth, static, tidy

trunk/cherrypy/lib/cptools.py

@@ -332 +332 @@
-                raise cherrypy.HTTPRedirect(new_url)
-
+def flatten():
+    """Wrap response.body in a generator that recursively iterates over body.
+    
+    This allows cherrypy.response.body to consist of 'nested generators';
+    that is, a set of generators that yield generators.
+    """
+    import types
+    def flattener(input):
+        for x in input:
+            if not isinstance(x, types.GeneratorType):
+                yield x
+            else:
+                for y in flattener(x):
+                    yield y 
+    response = cherrypy.response
+    response.body = flattener(response.body)
+

trunk/cherrypy/test/test_core.py

@@ -215 +215 @@
-        def as_dblyield(self):
-            yield self.as_yield()
+        as_dblyield._cp_config = {'tools.flatten.on': True}
-        
-        def as_refyield(self):