diff -r f9473eb6a8a9 -r a6547ff97ce0 pyramid_cubicweb/__init__.py --- a/pyramid_cubicweb/__init__.py Wed Apr 29 11:39:35 2015 +0200 +++ b/pyramid_cubicweb/__init__.py Tue Apr 28 11:04:03 2015 +0200 @@ -12,7 +12,7 @@ from ConfigParser import SafeConfigParser -def make_cubicweb_application(cwconfig): +def make_cubicweb_application(cwconfig, settings=None): """ Create a pyramid-based CubicWeb instance from a cubicweb configuration. @@ -23,7 +23,7 @@ """ settings_filenames = [os.path.join(cwconfig.apphome, 'pyramid.ini')] - settings = {} + settings = dict(settings) if settings else {} if cwconfig.debugmode: settings_filenames.insert(