diff options
| author | ianb <devnull@localhost> | 2005-05-11 22:06:38 +0000 |
|---|---|---|
| committer | ianb <devnull@localhost> | 2005-05-11 22:06:38 +0000 |
| commit | 5fd1a94e6634af31b3ddbb17ba3d6b527b6148a7 (patch) | |
| tree | 0acef76a37f807cfb159adb157ed8d9b86e36bb1 /paste/pyconfig.py | |
| parent | c776f2bfe737f7b2cc2c0d9a571930c4225b7b82 (diff) | |
| download | paste-5fd1a94e6634af31b3ddbb17ba3d6b527b6148a7.tar.gz | |
Option so you can override the early load process in setup_config (e.g., to let later config files know what context they are being used in)
Diffstat (limited to 'paste/pyconfig.py')
| -rw-r--r-- | paste/pyconfig.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/paste/pyconfig.py b/paste/pyconfig.py index 32aa384..04679a9 100644 --- a/paste/pyconfig.py +++ b/paste/pyconfig.py @@ -219,8 +219,13 @@ class Config(UserDict.DictMixin): pass return value -def setup_config(filename): +def setup_config(filename, add_config=None): conf = Config(with_default=True) + if add_config: + if isinstance(add_config, (str, unicode)): + conf.load(add_config) + else: + conf.load_dict(add_config) conf.load(filename) if conf.get('sys_path'): update_sys_path(conf['sys_path'], conf['verbose']) |
