Changeset 939

Timestamp:

01/25/06 10:26:13

Author:

rdelon

Message:

Reverting changeset [926]: Removing "is_app_root" proof of concept since we decided to go with the tree.mount() route for now.

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 +100 @@
-    
-    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()