Changeset 1469
- Timestamp:
- 12/03/06 04:35:46
- Files:
-
- trunk/cherrypy/__init__.py (modified) (1 diff)
- trunk/cherrypy/_cprequest.py (modified) (2 diffs)
- trunk/cherrypy/test/test_objectmapping.py (modified) (1 diff)
- trunk/cherrypy/test/test_routes.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/__init__.py
r1467 r1469 8 8 from cherrypy._cperror import TimeoutError 9 9 10 from cherrypy import _cpdispatch as dispatch 10 11 from cherrypy import _cprequest 11 from cherrypy import _cpdispatch as dispatch12 12 from cherrypy import _cpengine 13 13 engine = _cpengine.Engine() trunk/cherrypy/_cprequest.py
r1465 r1469 8 8 9 9 import cherrypy 10 from cherrypy._cpdispatch import *11 10 from cherrypy import _cpcgifs 12 11 from cherrypy._cperror import format_exc, bare_error … … 159 158 160 159 # Dispatch attributes 161 dispatch = Dispatcher()160 dispatch = cherrypy.dispatch.Dispatcher() 162 161 script_name = "" 163 162 path_info = "/" trunk/cherrypy/test/test_objectmapping.py
r1461 r1469 134 134 135 135 for url in script_names: 136 d = cherrypy. _cprequest.MethodDispatcher()136 d = cherrypy.dispatch.MethodDispatcher() 137 137 conf = {'/': {'user': (url or "/").split("/")[-2]}, 138 138 '/bymethod': {'request.dispatch': d}, trunk/cherrypy/test/test_routes.py
r1398 r1469 23 23 return "OK" 24 24 25 d = cherrypy. _cprequest.RoutesDispatcher()25 d = cherrypy.dispatch.RoutesDispatcher() 26 26 d.connect(name='hounslow', route='hounslow', controller=City('Hounslow')) 27 27 d.connect(name='surbiton', route='surbiton', controller=City('Surbiton'),
