Changeset 1271

Timestamp:

08/23/06 14:38:25

Author:

fumanchu

Message:

Moved the 'methods_with_bodies' feature from config to an attribute of the Request object; use a hook or tool to set it.

Files:

• trunk/cherrypy/_cprequest.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)

trunk/cherrypy/_cprequest.py

@@ -102 +102 @@
-    rfile = None
-    process_request_body = True
+    methods_with_bodies = ("POST", "PUT")
-    body = None
-    body_read = False
@@ -257 +258 @@
-                self.hooks.run('on_start_resource')
-                
-self.process_request_body and 
-# Check path-specific methods_with_bodies.
-meths = self.config.get("methods_with_bodies", ("POST", "PUT"))
-self.process_request_body = self.method in meths
+
+if self.process_request_body:
+    if self.method not in self.methods_with_bodies:
+        self.process_request_body = False
-                    
-
-
-
-
-
+
+
+
+
+
+
-                
-                self.hooks.run('before_request_body')

trunk/cherrypy/test/test_core.py

@@ -378 +378 @@
-        'server.max_request_header_size': 500,
-        })
+    
+    def expand_methods():
+        cherrypy.request.methods_with_bodies = ("POST", "PUT", "PROPFIND")
-    appconf = {
-        '/': {'log_access_file': log_access_file},
-methods_with_bodies': ("POST", "PUT", "PROPFIND")
+hooks.on_start_resource': expand_methods
-        }
-    cherrypy.tree.mount(root, conf=appconf)