ruamel/config: Use ruamel.yaml instead of yaml

This removes the (undocumented) dependency on PyYAML and just uses
ruamel.yaml that is already a dependency.

Signed-off-by: Andreas Rammhold <andreas@rammhold.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Andreas Rammhold 2020-02-17 19:44:05 +01:00 committed by Thomas Gleixner
parent 231d9f0bdb
commit 6bcb72f32e

View file

@ -18,8 +18,9 @@ from email.utils import make_msgid, formatdate
from email.policy import EmailPolicy from email.policy import EmailPolicy
from flufl.bounce import all_failures from flufl.bounce import all_failures
from ruamel.yaml import YAML
import mailbox import mailbox
import yaml
import os import os
class maillist(object): class maillist(object):
@ -315,7 +316,7 @@ class maillist_checker(object):
def __init__(self, configfile, logger): def __init__(self, configfile, logger):
self.logger = logger self.logger = logger
try: try:
cfgdict = yaml.load(open(configfile)) cfgdict = YAML().load(open(configfile))
except Exception as ex: except Exception as ex:
txt = 'Failed to load list configfile %s' %configfile txt = 'Failed to load list configfile %s' %configfile
logger.log_exception(txt, ex) logger.log_exception(txt, ex)