Changeset 904

Timestamp:

12/30/05 20:09:29

Author:

fumanchu

Message:

Made custom Request subclasses easier to implement:

1. Moved some required code from Request._run to Request.run, so overriding _run doesn't have to repeat it.
   
2. The _cpserver.Server class now has a request_class attribute, which is used to instantiate the class returned by server.request. It defaults to _cphttptools.Request.
   

Files:

• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/_cpserver.py (modified) (2 diffs)

trunk/cherrypy/_cphttptools.py

@@ -61 +61 @@
-        self.rfile = rfile
-        
+        self.headers = httptools.HeaderMap()
+        self.headerMap = self.headers # Backward compatibility
+        self.simpleCookie = Cookie.SimpleCookie()
+        
-        if cherrypy.profiler:
-            cherrypy.profiler.run(self._run)
-        else:
-            self._run()
+        
+        if self.method == "HEAD":
+            # HEAD requests MUST NOT return a message-body in the response.
+            cherrypy.response.body = []
+        
+        _cputil.get_special_attribute("_cp_log_access", "_cpLogAccess")()
+        
-        return cherrypy.response
-    
@@ -70 +81 @@
-        
-        try:
-            self.headers = httptools.HeaderMap()
-            self.headerMap = self.headers # Backward compatibility
-            self.simpleCookie = Cookie.SimpleCookie()
-            
-            # This has to be done very early in the request process,
-            # because request.object_path is used for config lookups
@@ -118 +125 @@
-                raise
-            cherrypy.response.handleError(sys.exc_info())
-        
-        if self.method == "HEAD":
-            # HEAD requests MUST NOT return a message-body in the response.
-            cherrypy.response.body = []
-        
-        _cputil.get_special_attribute("_cp_log_access", "_cpLogAccess")()
-    
-    def processRequestLine(self):

trunk/cherrypy/_cpserver.py

@@ -22 +22 @@
-
-class Server(object):
+    
+    request_class = _cphttptools.Request
-    
-    def __init__(self):
@@ -200 +202 @@
-                func(i)
-        
-_cphttptools.Request
-   
+self.request_class
+
-        cherrypy.serving.request = r
-        cherrypy.serving.response = _cphttptools.Response()