Changeset 1305

Timestamp:

09/01/06 11:46:15

Author:

fumanchu

Message:

Moved merge out of Application.__init__ so custom namespaces can be defined per-app. Also allow Tree.mount to accept an Application instance (instead of a root which gets wrapped in an Application).

Files:

• trunk/cherrypy/_cptree.py (modified) (4 diffs)

trunk/cherrypy/_cptree.py

@@ -19 +19 @@
-    """
-    
-, conf=None
+
-        self.log = _cplogging.LogManager(id(self))
-        self.root = root
@@ -26 +26 @@
-                           }
-        self.conf = {}
-        if conf:
-            self.merge(conf)
-    
-    def _get_script_name(self):
@@ -43 +41 @@
-        _cpconfig.merge(self.conf, conf)
-        
-Create log handlers a
+Handle namespace
-        rootconf = self.conf.get("/", {})
-        for k, v in rootconf.iteritems():
@@ -94 +92 @@
-        # Next line both 1) strips trailing slash and 2) maps "/" -> "".
-        script_name = script_name.rstrip("/")
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        self.apps[script_name] = app
-        
-        # If mounted at "", add favicon.ico
-        if script_name == "" and root and not hasattr(root, "favicon_ico"):
-            import os
-            from cherrypy import tools
-            favicon = os.path.join(os.getcwd(), os.path.dirname(__file__),
-                                   "favicon.ico")
-            root.favicon_ico = tools.staticfile.handler(favicon)
-        
-        return app