Loading src/common/env.py +13 −11 Original line number Diff line number Diff line Loading @@ -39,12 +39,12 @@ def check_environment(env_var, default=None): if env_var in locals(): os.environ[env_var] = str(locals()[env_var]) return locals()[env_var] #if default is not None: # os.environ[env_var] = str(default) if default is not None: os.environ[env_var] = str(default) return default def check_multi_environment(env_var_multi, multi_value, env_var): def check_multi_environment(env_var_multi, multi_value, env_var, default): """ Check if the mod environment variable exists, if so, return that. If not, check if the vanilla variable has been specified and return that value instead. Loading @@ -52,16 +52,18 @@ def check_multi_environment(env_var_multi, multi_value, env_var): :param env_var_multi: the modified environment variable to look for :param multi_value: the value of the modified environmental :param env_var: the vanilla environment variable to look for :param default: the vanilla environment variable default value """ # assume check environment has already been run on the init # check for existence of new var, if it doesn't exist, # return multi_value # check for existence of new var, if it exists, set environment # return multi value if str(env_var_multi) in os.environ: multi_value = check_environment(env_var_multi, multi_value) check_environment(env_var_multi, multi_value) return os.environ[env_var_multi] # by now: # exists - just return value - we don't need to set # set environment anyways for mutli os.environ[env_var_multi] = multi_value # set environment for vanilla and return vanilla check_environment(env_var, default) return os.environ[env_var] Loading
src/common/env.py +13 −11 Original line number Diff line number Diff line Loading @@ -39,12 +39,12 @@ def check_environment(env_var, default=None): if env_var in locals(): os.environ[env_var] = str(locals()[env_var]) return locals()[env_var] #if default is not None: # os.environ[env_var] = str(default) if default is not None: os.environ[env_var] = str(default) return default def check_multi_environment(env_var_multi, multi_value, env_var): def check_multi_environment(env_var_multi, multi_value, env_var, default): """ Check if the mod environment variable exists, if so, return that. If not, check if the vanilla variable has been specified and return that value instead. Loading @@ -52,16 +52,18 @@ def check_multi_environment(env_var_multi, multi_value, env_var): :param env_var_multi: the modified environment variable to look for :param multi_value: the value of the modified environmental :param env_var: the vanilla environment variable to look for :param default: the vanilla environment variable default value """ # assume check environment has already been run on the init # check for existence of new var, if it doesn't exist, # return multi_value # check for existence of new var, if it exists, set environment # return multi value if str(env_var_multi) in os.environ: multi_value = check_environment(env_var_multi, multi_value) check_environment(env_var_multi, multi_value) return os.environ[env_var_multi] # by now: # exists - just return value - we don't need to set # set environment anyways for mutli os.environ[env_var_multi] = multi_value # set environment for vanilla and return vanilla check_environment(env_var, default) return os.environ[env_var]