Changeset 1292

Timestamp:

08/28/06 16:28:08

Author:

fumanchu

Message:

Allow dynamic custom config namespaces.

Files:

• trunk/cherrypy/_cpconfig.py (modified) (2 diffs)
• trunk/cherrypy/_cprequest.py (modified) (3 diffs)

trunk/cherrypy/_cpconfig.py

@@ -123 +123 @@
-        }
-    
+    namespaces = {"server": lambda k, v: setattr(cherrypy.server, k, v),
+                  "engine": lambda k, v: setattr(cherrypy.engine, k, v),
+                  "log": lambda k, v: setattr(cherrypy.log, k, v),
+                  }
+    
-    def __init__(self):
-        self.reset()
@@ -164 +169 @@
-        atoms = k.split(".", 1)
-        namespace = atoms[0]
-
-
-
-
-
-
+
+
-
-

trunk/cherrypy/_cprequest.py

@@ -331 +331 @@
-        # Put a *copy* of the class error_page into self.
-        self.error_page = self.error_page.copy()
+        
+        self.namespaces = {"tools": self._set_tool,
+                           "hooks": self._set_hook,
+                           "request": self.__setattr__,
+                           "response": lambda k, v: setattr(cherrypy.response, k, v),
+                           "error_page": lambda k, v: self.error_page.__setitem__(int(k), v),
+                           }
-    
-    def close(self):
@@ -539 +546 @@
-        dispatch(path)
-    
+    def _set_tool(self, k, v):
+        """Attach tools specified in config."""
+        toolname, arg = k.split(".", 1)
+        bucket = self.toolmap.setdefault(toolname, {})
+        bucket[arg] = v
+    
+    def _set_hook(self, k, v):
+        """Attach bare hooks declared in config."""
+        # Use split again to allow multiple hooks for a single
+        # hookpoint per path (e.g. "hooks.before_main.1").
+        # Little-known fact you only get from reading source ;)
+        hookpoint = k.split(".", 1)[0]
+        if isinstance(v, basestring):
+            v = cherrypy.lib.attributes(v)
+        if not isinstance(v, Hook):
+            v = Hook(v)
+        self.hooks[hookpoint].append(v)
+    
-    def tool_up(self):
-        """Process self.config, populate self.toolmap and set up each tool."""
@@ -547 +572 @@
-            atoms = k.split(".", 1)
-            namespace = atoms[0]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        
-        # Run tool._setup(conf) for each tool in the new toolmap.