Show More
@@ -98,7 +98,7 b' def make_pyramid_app(global_config, **se' | |||
|
98 | 98 | global_config = _substitute_values(global_config, environ) |
|
99 | 99 | settings = _substitute_values(settings, environ) |
|
100 | 100 | |
|
101 | sanitize_settings_and_apply_defaults(settings) | |
|
101 | sanitize_settings_and_apply_defaults(global_config, settings) | |
|
102 | 102 | |
|
103 | 103 | config = Configurator(settings=settings) |
|
104 | 104 | |
@@ -381,7 +381,7 b' def wrap_app_in_wsgi_middlewares(pyramid' | |||
|
381 | 381 | return pyramid_app_with_cleanup |
|
382 | 382 | |
|
383 | 383 | |
|
384 | def sanitize_settings_and_apply_defaults(settings): | |
|
384 | def sanitize_settings_and_apply_defaults(global_config, settings): | |
|
385 | 385 | """ |
|
386 | 386 | Applies settings defaults and does all type conversion. |
|
387 | 387 | |
@@ -420,6 +420,7 b' def sanitize_settings_and_apply_defaults' | |||
|
420 | 420 | # TODO: johbo: Re-think this, usually the call to config.include |
|
421 | 421 | # should allow to pass in a prefix. |
|
422 | 422 | settings.setdefault('rhodecode.api.url', '/_admin/api') |
|
423 | settings.setdefault('__file__', global_config.get('__file__')) | |
|
423 | 424 | |
|
424 | 425 | # Sanitize generic settings. |
|
425 | 426 | _list_setting(settings, 'default_encoding', 'UTF-8') |
General Comments 0
You need to be logged in to leave comments.
Login now