diff --git a/neon_utils/signal_utils.py b/neon_utils/signal_utils.py index ace86239..28e4e6d4 100644 --- a/neon_utils/signal_utils.py +++ b/neon_utils/signal_utils.py @@ -125,8 +125,8 @@ def init_signal_handlers(): mycroft.util.signal.create_signal = _create_signal mycroft.util.signal.check_for_signal = _check_for_signal LOG.info(f"Overrode mycroft.util.signal methods") - except ImportError: - pass + except (ImportError, AttributeError) as e: + LOG.debug(e) except TypeError as e: # This comes from tests overriding MessageBusClient() LOG.error(e) diff --git a/neon_utils/skills/neon_skill.py b/neon_utils/skills/neon_skill.py index a58cdb94..b35ceedf 100644 --- a/neon_utils/skills/neon_skill.py +++ b/neon_utils/skills/neon_skill.py @@ -850,30 +850,30 @@ def converse(message): def translate(self, text: str, data: Optional[dict] = None): """ Deprecated method for translating a dialog file. - use self._resources.render_dialog(text, data) instead + use self.resources.render_dialog(text, data) instead """ log_deprecation("Use `resources.render_dialog`", "2.0.0") - return self._resources.render_dialog(text, data) + return self.resources.render_dialog(text, data) # renamed in base class for naming consistency # refactored to use new resource utils def translate_namedvalues(self, name: str, delim: str = ','): """ Deprecated method for translating a name/value file. - use self._resources.load_named_value_filetext, data) instead + use self.resources.load_named_value_filetext, data) instead """ log_deprecation("Use `resources.load_named_value_file`", "2.0.0") - return self._resources.load_named_value_file(name, delim) + return self.resources.load_named_value_file(name, delim) # renamed in base class for naming consistency # refactored to use new resource utils def translate_list(self, list_name: str, data: Optional[dict] = None): """ Deprecated method for translating a list. - use delf._resources.load_list_file(text, data) instead + use delf.resources.load_list_file(text, data) instead """ log_deprecation("Use `resources.load_list_file`", "2.0.0") - return self._resources.load_list_file(list_name, data) + return self.resources.load_list_file(list_name, data) # renamed in base class for naming consistency # refactored to use new resource utils @@ -881,10 +881,10 @@ def translate_template(self, template_name: str, data: Optional[dict] = None): """ Deprecated method for translating a template file - use delf._resources.template_file(text, data) instead + use self.resources.template_file(text, data) instead """ log_deprecation("Use `resources.template_file`", "2.0.0") - return self._resources.load_template_file(template_name, data) + return self.resources.load_template_file(template_name, data) def init_dialog(self, root_directory: Optional[str] = None): """