diff options
author | Laurence Rowe <laurence@lrowe.co.uk> | 2014-12-04 02:13:31 +0000 |
---|---|---|
committer | Laurence Rowe <laurence@lrowe.co.uk> | 2014-12-04 02:13:31 +0000 |
commit | 556611a4f7edef0c3363562ec9330915bb470074 (patch) | |
tree | 1ae04b88cbf922b65bc50fb32ef36ba9d2531388 | |
parent | 2200549c981712d4d1825ce238c8159797393bc2 (diff) | |
download | pastedeploy-git-556611a4f7edef0c3363562ec9330915bb470074.tar.gz |
Allow global_conf to override defaults, see: #7.
-rw-r--r-- | paste/deploy/loadwsgi.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/paste/deploy/loadwsgi.py b/paste/deploy/loadwsgi.py index 8b2849d..fc766b0 100644 --- a/paste/deploy/loadwsgi.py +++ b/paste/deploy/loadwsgi.py @@ -406,12 +406,11 @@ class ConfigLoader(_Loader): global_conf=global_conf) section = self.find_config_section( object_type, name=name) - if global_conf is None: - global_conf = {} - else: - global_conf = global_conf.copy() defaults = self.parser.defaults() - global_conf.update(defaults) + _global_conf = defaults.copy() + if global_conf is not None: + _global_conf.update(global_conf) + global_conf = _global_conf local_conf = {} global_additions = {} get_from_globals = {} |