X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/04951581a941697d68cdaf9af6661c3c412f1bce..10801e63c5029a2fffc3599235dddab62a2f3480:/sdk/python/arvados/config.py diff --git a/sdk/python/arvados/config.py b/sdk/python/arvados/config.py index 0c4ccb060d..6f3bd02790 100644 --- a/sdk/python/arvados/config.py +++ b/sdk/python/arvados/config.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + # config.py - configuration settings and global variables for Arvados clients # # Arvados configuration settings are taken from $HOME/.config/arvados. @@ -15,9 +19,6 @@ else: KEEP_BLOCK_SIZE = 2**26 EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0' -# This is the 64 MiB block consisting entirely of zeros -PADDING_BLOCK_LOCATOR = '7f614da9329cd3aebf59b91aadc30bf0+67108864' - def initialize(config_file=default_config_file): global _settings _settings = {} @@ -37,9 +38,7 @@ 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): + if re.match(r'^\s*(?:#|$)', config_line): continue var, val = config_line.rstrip().split('=', 2) cfg[var] = val