equal
deleted
inserted
replaced
42 cubicweb_appobject_path = (BaseWebConfiguration.cubicweb_appobject_path |
42 cubicweb_appobject_path = (BaseWebConfiguration.cubicweb_appobject_path |
43 | ServerConfiguration.cubicweb_appobject_path) |
43 | ServerConfiguration.cubicweb_appobject_path) |
44 cube_appobject_path = (BaseWebConfiguration.cube_appobject_path |
44 cube_appobject_path = (BaseWebConfiguration.cube_appobject_path |
45 | ServerConfiguration.cube_appobject_path) |
45 | ServerConfiguration.cube_appobject_path) |
46 |
46 |
47 options = merge_options(ServerConfiguration.options + |
47 options = merge_options(ServerConfiguration.options |
48 BaseWebConfiguration.options) |
48 + BaseWebConfiguration.options) |
49 |
49 |
50 def init_log(self, *args, **kwargs): |
50 def init_log(self, *args, **kwargs): |
51 """Rely on logging configuration in Pyramid's .ini file, do nothing |
51 """Rely on logging configuration in Pyramid's .ini file, do nothing |
52 here. |
52 here. |
53 """ |
53 """ |