Commits

Remi Delon  committed ec4f819

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

  • Participants
  • Parent commits d447c3f

Comments (0)

Files changed (2)

File cherrypy/__init__.py

 __version__ = '2.2.0beta'
 
 import datetime
-import os.path
 import sys
 import types
 
         msg += _cputil.formatExc()
     
     logfunc(msg, context, severity)
-
-def url(u):
-    return request.app_path + u

File cherrypy/_cphttptools.py

         objectTrail = _cputil.get_object_trail(objectpath)
         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()
         for i in xrange(len(objectTrail) - 1, -1, -1):