diff options
| author | Alfredo Deza <alfredodeza@gmail.com> | 2013-02-27 22:42:19 -0500 |
|---|---|---|
| committer | Alfredo Deza <alfredodeza@gmail.com> | 2013-02-27 22:42:46 -0500 |
| commit | 8431120b447076a531255d44d31c4fda6942d644 (patch) | |
| tree | 674ea1fa4b42374899f293cec1bc7d770bfc7e49 /pecan/configuration.py | |
| parent | 6667c75f37efd8aa7e82c5727f8007e7dacc90ba (diff) | |
| download | pecan-8431120b447076a531255d44d31c4fda6942d644.tar.gz | |
only when config is None fallback to conf_from_env
Diffstat (limited to 'pecan/configuration.py')
| -rw-r--r-- | pecan/configuration.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pecan/configuration.py b/pecan/configuration.py index 897bf52..9925ba9 100644 --- a/pecan/configuration.py +++ b/pecan/configuration.py @@ -212,7 +212,8 @@ def set_config(config, overwrite=False): if overwrite is True: _runtime_conf.empty() - config = config or conf_from_env() + if config is None: + config = conf_from_env() if isinstance(config, basestring): config = conf_from_file(config) |