Changeset 970
- Timestamp:
- 02/16/06 02:47:48
- Files:
-
- trunk/cherrypy/_cptree.py (modified) (1 diff)
- trunk/cherrypy/test/helper.py (modified) (1 diff)
- trunk/cherrypy/test/test_core.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cptree.py
r936 r970 17 17 18 18 def __init__(self): 19 self.mount_points = {} 19 self._mount_points = {} 20 21 def _get_mount_points(self): 22 m = self._mount_points 23 if "/" not in m: 24 import cherrypy 25 if not isinstance(cherrypy.root, Root): 26 m["/"] = cherrypy.root 27 return m 28 def _set_mount_points(self, newvalue): 29 self._mount_points = newvalue 30 mount_points = property(_get_mount_points, _set_mount_points) 20 31 21 32 def mount(self, app_root, baseurl=None, conf=None): trunk/cherrypy/test/helper.py
r965 r970 208 208 # because each module uses/overwrites cherrypy globals. 209 209 cherrypy.root = None 210 cherrypy.tree = cherrypy._cptree.Tree() 210 211 cherrypy.config.reset() 211 212 setConfig(conf) trunk/cherrypy/test/test_core.py
r967 r970 888 888 self.getPage('/') 889 889 self.assertHeader('Content-Type', 'text/plain') 890 891 def testTreeBackwardCompatibility(self): 892 self.assertEqual(cherrypy.tree.mount_points, {"/": cherrypy.root}) 893 890 894 891 895 if __name__ == '__main__':
