Changeset 3876

Timestamp:

09/27/06 21:07:00 (2 years ago)

Author:

adrian

Message:

Folded django.core.handlers.modpython.populate_apache_request into ModPythonHandler?.call() to save the overhead of a function call, and because that logic didn't need to be abstracted.

Files:

• django/trunk/django/core/handlers/modpython.py (modified) (1 diff)

django/trunk/django/core/handlers/modpython.py

@@ -161 +161 @@
-
-        # Convert our custom HttpResponse object back into the mod_python req.
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return 0 # mod_python.apache.OK
-
-def populate_apache_request(http_response, mod_python_req):
-    "Populates the mod_python request object with an HttpResponse"
-    mod_python_req.content_type = http_response['Content-Type']
-    for key, value in http_response.headers.items():
-        if key != 'Content-Type':
-            mod_python_req.headers_out[key] = value
-    for c in http_response.cookies.values():
-        mod_python_req.headers_out.add('Set-Cookie', c.output(header=''))
-    mod_python_req.status = http_response.status_code
-    try:
-        for chunk in http_response:
-            mod_python_req.write(chunk)
-    finally:
-        http_response.close()
-
-def handler(req):