From b260eb916863aa2dc1e632bdd164ee67c4675c68 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Mon, 18 Feb 2019 18:04:42 -0500 Subject: gcode: Raise a config error on invalid register_command() Raise a printer.config_error() on an invalid register_command() call. This error is easier to handle for the vast majority of callers. Signed-off-by: Kevin O'Connor --- klippy/extras/gcode_macro.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'klippy/extras/gcode_macro.py') diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py index 3818df7e..e34dbf74 100644 --- a/klippy/extras/gcode_macro.py +++ b/klippy/extras/gcode_macro.py @@ -13,11 +13,7 @@ class GCodeMacro: self.script = config.get('gcode') printer = config.get_printer() self.gcode = printer.lookup_object('gcode') - try: - self.gcode.register_command( - self.alias, self.cmd, desc=self.cmd_desc) - except self.gcode.error as e: - raise config.error(str(e)) + self.gcode.register_command(self.alias, self.cmd, desc=self.cmd_desc) self.in_script = False self.kwparams = { o[len(DEFAULT_PREFIX):].upper(): config.get(o) for o in config.get_prefix_options(DEFAULT_PREFIX) } -- cgit v1.2.3-70-g09d2