vmtp/vmtp/config.py
Cédric Ollivier a8269684ff Fix YAMLLoadWarning
Calling yaml.load() without Loader=... is deprecated

Change-Id: Iaff10677a452937c312a9249e229f49929544faa
Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>
2019-05-20 20:41:44 +02:00

47 lines
1.5 KiB
Python

# Copyright 2015 Cisco Systems, Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
from attrdict import AttrDict
import yaml
def config_load(file_name, from_cfg=None):
'''Load a yaml file into a config dict, merge with from_cfg if not None
The config file content taking precedence in case of duplicate
'''
with open(file_name) as fileobj:
cfg = AttrDict(yaml.safe_load(fileobj))
if from_cfg:
return from_cfg + cfg
return cfg
def config_loads(cfg_text, from_cfg=None):
'''Same as config_load but load from a string
'''
try:
cfg = AttrDict(yaml.safe_load(cfg_text))
except TypeError:
# empty string
cfg = AttrDict()
if from_cfg:
return from_cfg + cfg
return cfg
def test_config():
cfg = config_load('a1.yaml')
cfg = config_load('a2.yaml', cfg)
cfg = config_loads('color: 500', cfg)
config_loads('')
config_loads('#')