Changeset 1386

Timestamp:

09/29/06 19:17:17

Author:

fumanchu

Message:

Put most common types first when asserting response.body is iterable.

Files:

• trunk/cherrypy/_cprequest.py (modified) (1 diff)

trunk/cherrypy/_cprequest.py

@@ -698 +698 @@
-            raise cherrypy.TimeoutError()
-        # Convert the given value to an iterable object.
-
-
-
-
-
+
-            # strings get wrapped in a list because iterating over a single
-            # item list is much faster than iterating over every character
-            # in a long string.
-            value = [value]
+        elif isinstance(value, types.FileType):
+            value = file_generator(value)
+        elif isinstance(value, types.GeneratorType):
+            value = flattener(value)
-        elif value is None:
-            value = []