summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pecan/configuration.py3
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)