# HG changeset patch # User Mads Kiilerich # Date 1473115878 -7200 # Node ID a9412063e8bcfc67cb78a9aa2c156bab21feafd2 # Parent 7c917e15c04578c920a2b8ffff58b342500d468c config: drop unused load_environment parameter initial diff -r 7c917e15c045 -r a9412063e8bc kallithea/config/environment.py --- a/kallithea/config/environment.py Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/config/environment.py Tue Sep 06 00:51:18 2016 +0200 @@ -44,7 +44,7 @@ log = logging.getLogger(__name__) -def load_environment(global_conf, app_conf, initial=False, +def load_environment(global_conf, app_conf, test_env=None, test_index=None): """ Configure the Pylons environment via the ``pylons.config`` diff -r 7c917e15c045 -r a9412063e8bc kallithea/websetup.py --- a/kallithea/websetup.py Tue Sep 06 00:51:18 2016 +0200 +++ b/kallithea/websetup.py Tue Sep 06 00:51:18 2016 +0200 @@ -48,5 +48,5 @@ dbmanage.create_permissions() dbmanage.populate_default_permissions() Session().commit() - load_environment(conf.global_conf, conf.local_conf, initial=True) + load_environment(conf.global_conf, conf.local_conf) DbManage.check_waitress()