projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9463-pysdk-amended'
[arvados.git]
/
sdk
/
python
/
arvados
/
config.py
diff --git
a/sdk/python/arvados/config.py
b/sdk/python/arvados/config.py
index 211e6f5563b0d9a0a3727e31df32b5b7ef790ac9..8f2b2654ad1b73f7720415943c09c60f0d575791 100644
(file)
--- a/
sdk/python/arvados/config.py
+++ b/
sdk/python/arvados/config.py
@@
-7,8
+7,12
@@
import os
import re
_settings = None
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):
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:
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
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)
def get(key, default_val=None):
return settings().get(key, default_val)