Download Install Tutorial Docs FAQ Tools WikiLicense Team IRC Planet Involvement Shop Book

Changeset 1085

Show
Ignore:
Timestamp:
05/02/06 15:58:35
Author:
fumanchu
Message:

Fixed bug in request_config_section.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/cherrypy/config.py

    r1083 r1085  
    206206        foundpath = "/" 
    207207    for name in nameList: 
     208        curpath = "/".join((curpath, name)) 
     209         
    208210        # Get _cp_config attached to each node on the cherrypy tree. 
    209211        objname = name.replace('.', '_') 
     
    218220         
    219221        # Get values from cherrypy.config for this path. 
    220         curpath = "/".join((curpath, name)) 
    221222        if key in configs.get(curpath, {}): 
    222223            foundpath = curpath 
  • trunk/cherrypy/tools.py

    r1083 r1085  
    223223        # Stick the section where "dir" was defined into the params. 
    224224        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') 
    226226        def wrapper(): 
    227             if self.callable(**conf): 
     227            if self.callable(section, **conf): 
    228228                cherrypy.request.dispatch = None 
    229229        # Don't pass conf (or our wrapper will get wrapped!) 

Hosted by WebFaction

Log in as guest/cpguest to create tickets