diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2020-05-05 14:10:30 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-05-08 11:05:14 -0400 |
| commit | 787ed452c2abe3bad81ffaf732b0b2609e3534bb (patch) | |
| tree | efe45de24864649b4219e6a45c1ebfb82574fe28 /klippy/extras/display | |
| parent | 8472c57b594e6f8ff26d7be32b4bdd5072ed439a (diff) | |
| download | kutter-787ed452c2abe3bad81ffaf732b0b2609e3534bb.tar.gz kutter-787ed452c2abe3bad81ffaf732b0b2609e3534bb.tar.xz kutter-787ed452c2abe3bad81ffaf732b0b2609e3534bb.zip | |
klippy: Rename try_load_module() to load_object()
Rename try_load_module() so that it uses consistent naming for
"printer objects". Change the function to raise an error by default
if the specified module does not exist.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/display')
| -rw-r--r-- | klippy/extras/display/display.py | 6 | ||||
| -rw-r--r-- | klippy/extras/display/menu.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/klippy/extras/display/display.py b/klippy/extras/display/display.py index c2a0a23d..0433c432 100644 --- a/klippy/extras/display/display.py +++ b/klippy/extras/display/display.py @@ -30,7 +30,7 @@ class DisplayTemplate: raise config.error( "Option '%s' in section '%s' is not a valid literal" % ( option, config.get_name())) - gcode_macro = self.printer.try_load_module(config, 'gcode_macro') + gcode_macro = self.printer.load_object(config, 'gcode_macro') self.template = gcode_macro.load_template(config, 'text') def render(self, context, **kwargs): params = dict(self.params) @@ -58,7 +58,7 @@ class DisplayGroup: # Load all templates and store sorted by display position configs_by_name = {c.get_name(): c for c in data_configs} printer = config.get_printer() - gcode_macro = printer.try_load_module(config, 'gcode_macro') + gcode_macro = printer.load_object(config, 'gcode_macro') self.data_items = [] for row, col, name in sorted(items): c = configs_by_name[name] @@ -88,7 +88,7 @@ class PrinterLCD: if name == 'display': # only load menu for primary display self.menu = menu.MenuManager(config, self.lcd_chip) - self.printer.try_load_module(config, "display_status") + self.printer.load_object(config, "display_status") # Configurable display self.display_templates = {} self.display_data_groups = {} diff --git a/klippy/extras/display/menu.py b/klippy/extras/display/menu.py index 69158bf3..8c0ffeb5 100644 --- a/klippy/extras/display/menu.py +++ b/klippy/extras/display/menu.py @@ -1019,7 +1019,7 @@ class MenuManager: self._last_encoder_cw_eventtime = 0 self._last_encoder_ccw_eventtime = 0 # printer objects - self.buttons = self.printer.try_load_module(config, "buttons") + self.buttons = self.printer.load_object(config, "buttons") # register itself for printer callbacks self.printer.add_object('menu', self) self.printer.register_event_handler("klippy:ready", self.handle_ready) |