Changeset 1325
- Timestamp:
- 09/02/06 18:24:31
- Files:
-
- trunk/cherrypy/_cprequest.py (modified) (3 diffs)
- trunk/cherrypy/_cpserver.py (modified) (1 diff)
- trunk/cherrypy/_cptools.py (modified) (6 diffs)
- trunk/cherrypy/test/test_core.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/_cprequest.py
r1321 r1325 336 336 337 337 hookpoints = ['on_start_resource', 'before_request_body', 338 'before_ main', 'before_finalize',338 'before_handler', 'before_finalize', 339 339 'on_end_resource', 'on_end_request', 340 340 'before_error_response', 'after_error_response'] … … 525 525 self.process_body() 526 526 527 self.hooks.run('before_ main')527 self.hooks.run('before_handler') 528 528 if self.handler: 529 529 self.handler() … … 618 618 """Attach bare hooks declared in config.""" 619 619 # Use split again to allow multiple hooks for a single 620 # hookpoint per path (e.g. "hooks.before_ main.1").620 # hookpoint per path (e.g. "hooks.before_handler.1"). 621 621 # Little-known fact you only get from reading source ;) 622 622 hookpoint = k.split(".", 1)[0] trunk/cherrypy/_cpserver.py
r1316 r1325 57 57 58 58 def quickstart(self, server=None): 59 """ Main function for quick starts. MUST be called from the main thread.59 """Start from defaults. MUST be called from the main thread. 60 60 61 61 This function works like CherryPy 2's server.start(). It loads and trunk/cherrypy/_cptools.py
r1322 r1325 95 95 96 96 97 class MainTool(Tool):97 class HandlerTool(Tool): 98 98 """Tool which is called 'before main', that may skip normal handlers. 99 99 … … 103 103 104 104 def __init__(self, callable, name=None): 105 Tool.__init__(self, 'before_ main', callable, name)105 Tool.__init__(self, 'before_handler', callable, name) 106 106 107 107 def handler(self, *args, **kwargs): … … 228 228 229 229 230 class WSGIAppTool( MainTool):230 class WSGIAppTool(HandlerTool): 231 231 """A tool for running any WSGI middleware/application within CP. 232 232 … … 249 249 # Keep request body intact so the wsgi app can have its way with it. 250 250 cherrypy.request.process_request_body = False 251 MainTool._setup(self)252 253 254 class SessionAuthTool( MainTool):251 HandlerTool._setup(self) 252 253 254 class SessionAuthTool(HandlerTool): 255 255 256 256 def _setargs(self): … … 274 274 """Hook caching into cherrypy.request.""" 275 275 conf = self._merged_args() 276 cherrypy.request.hooks.attach('before_ main', self._wrapper, **conf)276 cherrypy.request.hooks.attach('before_handler', self._wrapper, **conf) 277 277 278 278 … … 300 300 default_toolbox.err_redirect = ErrorTool(cptools.redirect) 301 301 default_toolbox.etags = Tool('before_finalize', cptools.validate_etags) 302 default_toolbox.decode = Tool('before_ main', encoding.decode)302 default_toolbox.decode = Tool('before_handler', encoding.decode) 303 303 default_toolbox.encode = Tool('before_finalize', encoding.encode) 304 304 default_toolbox.gzip = Tool('before_finalize', encoding.gzip) 305 default_toolbox.staticdir = MainTool(static.staticdir)306 default_toolbox.staticfile = MainTool(static.staticfile)305 default_toolbox.staticdir = HandlerTool(static.staticdir) 306 default_toolbox.staticfile = HandlerTool(static.staticfile) 307 307 # _sessions.init must be bound after headers are read 308 308 default_toolbox.sessions = SessionTool('before_request_body', _sessions.init) 309 309 default_toolbox.xmlrpc = XMLRPCTool() 310 310 default_toolbox.wsgiapp = WSGIAppTool(_wsgiapp.run) 311 default_toolbox.caching = CachingTool('before_ main', _caching.get, 'caching')311 default_toolbox.caching = CachingTool('before_handler', _caching.get, 'caching') 312 312 default_toolbox.expires = Tool('before_finalize', _caching.expires) 313 313 default_toolbox.tidy = Tool('before_finalize', tidy.tidy) trunk/cherrypy/test/test_core.py
r1321 r1325 139 139 if not getattr(cherrypy.request, "login", None): 140 140 raise cherrypy.InternalRedirect("/internalredirect/login") 141 tools.login_redir = _cptools.Tool('before_ main', login_redir)141 tools.login_redir = _cptools.Tool('before_handler', login_redir) 142 142 143 143 def redir_custom():
