projects
/
osm
/
PLA.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update version of PyYAML
[osm/PLA.git]
/
osm_pla
/
config
/
config.py
diff --git
a/osm_pla/config/config.py
b/osm_pla/config/config.py
index
114fc5f
..
2fd7a8b
100644
(file)
--- a/
osm_pla/config/config.py
+++ b/
osm_pla/config/config.py
@@
-25,17
+25,17
@@
logger = logging.getLogger(__name__)
class Config:
class Config:
- def __init__(self, config_file: str =
''
):
+ def __init__(self, config_file: str =
""
):
self.conf = {}
self._read_config_file(config_file)
self._read_env()
def _read_config_file(self, config_file):
if not config_file:
self.conf = {}
self._read_config_file(config_file)
self._read_env()
def _read_config_file(self, config_file):
if not config_file:
- path =
'pla.yaml'
+ path =
"pla.yaml"
config_file = pkg_resources.resource_filename(__name__, path)
with open(config_file) as f:
config_file = pkg_resources.resource_filename(__name__, path)
with open(config_file) as f:
- self.conf = yaml.load(f)
+ self.conf = yaml.
safe_
load(f)
def _read_env(self):
for env in os.environ:
def _read_env(self):
for env in os.environ:
@@
-45,10
+45,12
@@
class Config:
if len(elements) < 3:
logger.warning(
"Environment variable %s=%s does not comply with required format. Section and/or field missing.",
if len(elements) < 3:
logger.warning(
"Environment variable %s=%s does not comply with required format. Section and/or field missing.",
- env, os.getenv(env))
+ env,
+ os.getenv(env),
+ )
continue
section = elements[1]
continue
section = elements[1]
- field =
'_'
.join(elements[2:])
+ field =
"_"
.join(elements[2:])
value = os.getenv(env)
if section not in self.conf:
self.conf[section] = {}
value = os.getenv(env)
if section not in self.conf:
self.conf[section] = {}