Mercurial > kallithea
diff rhodecode/config/environment.py @ 1205:f4807acf643d beta
added __license__ into main of rhodecode, PEP8ify
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 04 Apr 2011 19:43:31 +0200 |
parents | 405b80e4ccd5 |
children | 882ac77dc709 |
line wrap: on
line diff
--- a/rhodecode/config/environment.py Sun Apr 03 18:49:12 2011 +0200 +++ b/rhodecode/config/environment.py Mon Apr 04 19:43:31 2011 +0200 @@ -21,6 +21,7 @@ log = logging.getLogger(__name__) + def load_environment(global_conf, app_conf, initial=False): """Configure the Pylons environment via the ``pylons.config`` object @@ -67,7 +68,7 @@ if config['debug'] and not test: #use query time debugging. sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.', - proxy=TimerProxy()) + proxy=TimerProxy()) else: sa_engine_db1 = engine_from_config(config, 'sqlalchemy.db1.')