From 16963a8e1af2babe0b0abc0ca044de8877e03617 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 22 Dec 2020 20:07:39 -0500 Subject: [PATCH] configfile: Improve error message when a required option is missing Signed-off-by: Kevin O'Connor --- klippy/configfile.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/klippy/configfile.py b/klippy/configfile.py index f21c4779..ffabf946 100644 --- a/klippy/configfile.py +++ b/klippy/configfile.py @@ -23,9 +23,11 @@ class ConfigWrapper: return self.section def _get_wrapper(self, parser, option, default, minval=None, maxval=None, above=None, below=None, note_valid=True): - if (default is not sentinel - and not self.fileconfig.has_option(self.section, option)): - return default + if not self.fileconfig.has_option(self.section, option): + if default is not sentinel: + return default + raise error("Option '%s' in section '%s' must be specified" + % (option, self.section)) if note_valid: self.access_tracking[(self.section.lower(), option.lower())] = 1 try: