Changeset 4952

Show
Ignore:
Timestamp:
07/14/08 10:50:27 (6 months ago)
Author:
kskuhlman
Message:

Fix bad manual merge of config.get, app.cfg template from cp3 branch into 1.5.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.5/turbogears/config.py

    r4927 r4952  
    201201    followed by the config file. This means that the config file's options 
    202202    override the options in the module file.""" 
     203    global configdict 
    203204    configdict = config_obj(configfile, modulename).dict() 
    204205    configure_loggers(configdict) 
    …… 
    207208def get(key, default_value=None, return_section=False, path=None): 
    208209    """Retrieves a config value""" 
    209     value = config.get(key, default_value, return_section, path) 
     210    value = config.get(key, default_value) 
    210211    if value and key == 'sqlobject.dburi' and os.name == 'nt': 
    211212        value = re.sub('///(\w):', '///\\1|', value) 
    212213    return value 
    213214 
     215 
    214216def update(configvalues): 
    215217    """Updates the configuration with the values from the dictionary.""" 

  • branches/1.5/turbogears/qstemplates/quickstart/+package+/config/app.cfg_tmpl

    r4930 r4952  
    205205# compress the data sends to the web browser 
    206206# [/] 
    207 # gzip_filter.on = True 
    208 # gzip_filter.mime_types = ["application/json", "application/x-javascript", 
     207# tools.gzip.mime_types = ["application/json", "application/x-javascript", 
    209208#     "text/javascript", "text/html", "text/css", "text/plain"] 
    210209 
    211210[/static] 
    212 static_filter.on = True 
    213 static_filter.dir = "%(top_level_dir)s/static" 
     211tools.staticdir.dir = "%(top_level_dir)s/static" 
    214212 
    215213[/favicon.ico] 
    216 static_filter.on = True 
    217 static_filter.file = "%(top_level_dir)s/static/images/favicon.ico" 
     214tools.staticfile.filename = "%(top_level_dir)s/static/images/favicon.ico"