X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/143bbe8d10d826b05357a531de6aa2a14f4cffb9..c8aa6553fd4af8be3ca9b1d9d9d660750cd59d1b:/sdk/python/arvados/config.py diff --git a/sdk/python/arvados/config.py b/sdk/python/arvados/config.py index 211e6f5563..8f2b2654ad 100644 --- a/sdk/python/arvados/config.py +++ b/sdk/python/arvados/config.py @@ -7,8 +7,12 @@ import os import re _settings = None -default_config_file = os.environ['HOME'] + '/.config/arvados/settings.conf' +if os.environ.get('HOME') is not None: + default_config_file = os.environ['HOME'] + '/.config/arvados/settings.conf' +else: + default_config_file = '' +KEEP_BLOCK_SIZE = 2**26 EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0' def initialize(config_file=default_config_file): @@ -30,14 +34,18 @@ def load(config_file): cfg = {} with open(config_file, "r") as f: for config_line in f: + if re.match('^\s*$', config_line): + continue if re.match('^\s*#', config_line): continue var, val = config_line.rstrip().split('=', 2) cfg[var] = val return cfg -def flag_is_true(key): - return get(key, '').lower() in set(['1', 't', 'true', 'y', 'yes']) +def flag_is_true(key, d=None): + if d is None: + d = settings() + return d.get(key, '').lower() in set(['1', 't', 'true', 'y', 'yes']) def get(key, default_val=None): return settings().get(key, default_val)