Changeset 926

Timestamp:

01/12/06 12:42:46

Author:

rdelon

Message:

Proof of concept idea to handle multiple apps: adding a cherrypy.url() function and a is_app_root class attribute for apps

Files:

• trunk/cherrypy/__init__.py (modified) (2 diffs)
• trunk/cherrypy/_cphttptools.py (modified) (1 diff)

trunk/cherrypy/__init__.py

@@ -4 +4 @@
-
-import datetime
+import os.path
-import sys
-import types
@@ -101 +102 @@
-    logfunc(msg, context, severity)
-
+def url(u):
+    return request.app_path + u

trunk/cherrypy/_cphttptools.py

@@ -270 +270 @@
-        names = [name for name, candidate in objectTrail]
-        
+        # Try to get app_path:
+        current_objectpath = objectpath
+        for i in xrange(len(objectTrail) - 1, -1, -1):
+            name, candidate = objectTrail[i]
+            if getattr(candidate, 'is_app_root', False):
+                cherrypy.request.app_path = current_objectpath
+                break
+            current_objectpath = os.path.dirname(current_objectpath)
+
-        # Try successive objects (reverse order)
-        mounted_app_roots = cherrypy.tree.mount_points.values()