projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4705: Add CollectionReader.api_response() to PySDK.
[arvados.git]
/
sdk
/
python
/
arvados
/
config.py
diff --git
a/sdk/python/arvados/config.py
b/sdk/python/arvados/config.py
index 211e6f5563b0d9a0a3727e31df32b5b7ef790ac9..a0c3cc64ae1306b16ff65feb5ca9b1b210f47c7d 100644
(file)
--- a/
sdk/python/arvados/config.py
+++ b/
sdk/python/arvados/config.py
@@
-7,7
+7,10
@@
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 = ''
EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0'
EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0'
@@
-30,6
+33,8
@@
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)
if re.match('^\s*#', config_line):
continue
var, val = config_line.rstrip().split('=', 2)