From 8431120b447076a531255d44d31c4fda6942d644 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 27 Feb 2013 22:42:19 -0500 Subject: [PATCH] only when config is None fallback to conf_from_env --- pecan/configuration.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)