Commits

Robert Brewer committed 800068b

Fix for #446 (tree.mount should optionally set its own baseurl from config).

Comments (0)

Files changed (1)

cherrypy/_cptree.py

     def __init__(self):
         self.mount_points = {}
     
-    def mount(self, app_root, baseurl="/", conf=None):
+    def mount(self, app_root, baseurl=None, conf=None):
         """Mount the given app_root at the given baseurl (relative to root)."""
         import cherrypy
         
+        if conf and not isinstance(conf, dict):
+            conf = cherrypy.config.dict_from_config_file(conf)
+        
+        if baseurl is None:
+            baseurl = "/"
+            if conf:
+                conf_pt = conf.get("global", {}).get("mount_point")
+                if conf_pt:
+                    baseurl = conf_pt
+        
         point = baseurl.lstrip("/")
         if point:
             node = cherrypy.root
         self.mount_points[baseurl] = app_root
         
         if conf is not None:
-            if isinstance(conf, dict):
-                cherrypy.config.update(updateMap=conf, baseurl=baseurl)
-            else:
-                cherrypy.config.update(file=conf, baseurl=baseurl)
+            cherrypy.config.update(updateMap=conf, baseurl=baseurl)
     
     def mount_point(self, path=None):
         """The 'root path' of the app which governs the given path, or None.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.