only when config is None fallback to conf_from_env

2013-02-27 22:42:19 -05:00
parent 6667c75f37
commit 8431120b44
1 changed files with 2 additions and 1 deletions
--- 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)