Mercurial > kallithea
diff pylons_app/config/environment.py @ 41:71ffa932799d
Added app basic auth.
Changed few deprecations for new pylons.
added sqlite logging for user actions.
| author | Marcin Kuzminski <marcin@python-blog.com> |
|---|---|
| date | Wed, 07 Apr 2010 00:51:55 +0200 |
| parents | f93b523c0be3 |
| children | 2e1247e62c5b |
line wrap: on
line diff
--- a/pylons_app/config/environment.py Tue Apr 06 22:21:23 2010 +0200 +++ b/pylons_app/config/environment.py Wed Apr 07 00:51:55 2010 +0200 @@ -28,17 +28,16 @@ template_engine='mako', paths=paths) config['routes.map'] = make_map() - config['pylons.g'] = app_globals.Globals() + config['pylons.app_globals'] = app_globals.Globals() config['pylons.h'] = pylons_app.lib.helpers # Create the Mako TemplateLookup, with the default auto-escaping - config['pylons.g'].mako_lookup = TemplateLookup( + config['pylons.app_globals'].mako_lookup = TemplateLookup( directories=paths['templates'], error_handler=handle_mako_error, module_directory=os.path.join(app_conf['cache_dir'], 'templates'), - output_encoding='utf-8', - imports=['from webhelpers.html import escape'], - default_filters=['escape']) + input_encoding='utf-8', default_filters=['escape'], + imports=['from webhelpers.html import escape']) # CONFIGURATION OPTIONS HERE (note: all config options will override # any Pylons config options)