3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

confighelper: make parsed a required argument 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-04-05 08:30:58 -04:00
parent ea25cce38f
commit fb2eacf702
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
moonraker/confighelper.py
View File

@ -48,7 +48,7 @@ class ConfigHelper:
server: Server, server: Server,
config: configparser.ConfigParser, config: configparser.ConfigParser,
section: str, section: str,
parsed: Dict[str, Dict[str, ConfigVal]] = {}, parsed: Dict[str, Dict[str, ConfigVal]],
fallback_section: Optional[str] = None fallback_section: Optional[str] = None
) -> None: ) -> None:
self.server = server self.server = server
@ -402,7 +402,7 @@ class ConfigHelper:
except Exception: except Exception:
raise ConfigError("Error Reading Object") raise ConfigError("Error Reading Object")
sections = sup_cfg.sections() sections = sup_cfg.sections()
return ConfigHelper(self.server, sup_cfg, sections[0]) return ConfigHelper(self.server, sup_cfg, sections[0], {})
def read_supplemental_config(self, file_name: str) -> ConfigHelper: def read_supplemental_config(self, file_name: str) -> ConfigHelper:
cfg_file_path = os.path.normpath(os.path.expanduser(file_name)) cfg_file_path = os.path.normpath(os.path.expanduser(file_name))
@ -415,7 +415,7 @@ class ConfigHelper:
except Exception: except Exception:
raise ConfigError(f"Error Reading Config: '{cfg_file_path}'") raise ConfigError(f"Error Reading Config: '{cfg_file_path}'")
sections = sup_cfg.sections() sections = sup_cfg.sections()
return ConfigHelper(self.server, sup_cfg, sections[0]) return ConfigHelper(self.server, sup_cfg, sections[0], {})
def write_config(self, file_obj: IO[str]) -> None: def write_config(self, file_obj: IO[str]) -> None:
self.config.write(file_obj) self.config.write(file_obj)
@ -461,7 +461,7 @@ def get_configuration(server: Server,
raise ConfigError(f"Error Reading Config: '{cfg_file_path}'") from e raise ConfigError(f"Error Reading Config: '{cfg_file_path}'") from e
if not config.has_section('server'): if not config.has_section('server'):
raise ConfigError("No section [server] in config") raise ConfigError("No section [server] in config")
return ConfigHelper(server, config, 'server') return ConfigHelper(server, config, 'server', {})
def backup_config(cfg_path: str) -> None: def backup_config(cfg_path: str) -> None:
cfg = pathlib.Path(cfg_path).expanduser().resolve() cfg = pathlib.Path(cfg_path).expanduser().resolve()