Env var vs config priority fixing

This commit is contained in:
Michael DeHaan 2012-10-17 22:34:59 -04:00
parent 21b1e6c5a4
commit fd6a26239c

View file

@ -22,7 +22,9 @@ import traceback
def get_config(p, section, key, env_var, default):
if env_var is not None:
return os.environ.get(env_var, default)
value = os.environ.get(env_var, None)
if value is not None:
return value
if p is not None:
try:
return p.get(section, key)