Changeset 1085
- Timestamp:
- 05/02/06 15:58:35
- Files:
-
- trunk/cherrypy/config.py (modified) (2 diffs)
- trunk/cherrypy/tools.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/cherrypy/config.py
r1083 r1085 206 206 foundpath = "/" 207 207 for name in nameList: 208 curpath = "/".join((curpath, name)) 209 208 210 # Get _cp_config attached to each node on the cherrypy tree. 209 211 objname = name.replace('.', '_') … … 218 220 219 221 # Get values from cherrypy.config for this path. 220 curpath = "/".join((curpath, name))221 222 if key in configs.get(curpath, {}): 222 223 foundpath = curpath trunk/cherrypy/tools.py
r1083 r1085 223 223 # Stick the section where "dir" was defined into the params. 224 224 conf = self.merged_args() 225 conf['section']= cherrypy.config.request_config_section('tools.staticdir.dir')225 section = cherrypy.config.request_config_section('tools.staticdir.dir') 226 226 def wrapper(): 227 if self.callable( **conf):227 if self.callable(section, **conf): 228 228 cherrypy.request.dispatch = None 229 229 # Don't pass conf (or our wrapper will get wrapped!)

