From 203e1fc740b0545d87a8db6bac54d7fcd925e402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke=20Forslund?= Date: Sun, 7 Mar 2021 09:03:07 +0100 Subject: [PATCH] Remove intent-service backwards compatibility - Remove unused ContextManager import from mycroft.skills.intent_service - Remove Old 'intent_failure' -> fallback handler - Remove handling of fallback messages without the fallback_range parameter --- mycroft/skills/__main__.py | 2 -- mycroft/skills/fallback_skill.py | 5 ----- mycroft/skills/intent_service.py | 3 --- test/unittests/skills/test_intent_service.py | 5 +++-- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/mycroft/skills/__main__.py b/mycroft/skills/__main__.py index 97cffe3673..85f809bc91 100644 --- a/mycroft/skills/__main__.py +++ b/mycroft/skills/__main__.py @@ -250,8 +250,6 @@ def _register_intent_services(bus): 'mycroft.skills.fallback', FallbackSkill.make_intent_failure_handler(bus) ) - # Backwards compatibility TODO: remove in 20.08 - bus.on('intent_failure', FallbackSkill.make_intent_failure_handler(bus)) return service diff --git a/mycroft/skills/fallback_skill.py b/mycroft/skills/fallback_skill.py index d239074669..70ef177006 100644 --- a/mycroft/skills/fallback_skill.py +++ b/mycroft/skills/fallback_skill.py @@ -95,11 +95,6 @@ class FallbackSkill(MycroftSkill): bus.emit(message.forward('mycroft.skill.handler.complete', data={'handler': "fallback", 'exception': warning})) - if 'fallback_range' not in message.data: - # Old system TODO: Remove in 20.08 - # No fallback could handle the utterance - bus.emit(message.forward('complete_intent_failure')) - LOG.warning(warning) # return if the utterance was handled to the caller bus.emit(message.response(data={'handled': status})) diff --git a/mycroft/skills/intent_service.py b/mycroft/skills/intent_service.py index d461956820..3981b8cd7c 100644 --- a/mycroft/skills/intent_service.py +++ b/mycroft/skills/intent_service.py @@ -26,9 +26,6 @@ from .intent_services import ( ) from .intent_service_interface import open_intent_envelope -# TODO: Remove in 20.08 (Backwards compatibility) -from .intent_services.adapt_service import ContextManager - def _get_message_lang(message): """Get the language from the message or the default language. diff --git a/test/unittests/skills/test_intent_service.py b/test/unittests/skills/test_intent_service.py index 1546e7e8ca..2363561f48 100644 --- a/test/unittests/skills/test_intent_service.py +++ b/test/unittests/skills/test_intent_service.py @@ -18,8 +18,9 @@ from adapt.intent import IntentBuilder from mycroft.configuration import Configuration from mycroft.messagebus import Message -from mycroft.skills.intent_service import (ContextManager, IntentService, - _get_message_lang, AdaptIntent) +from mycroft.skills.intent_service import IntentService, _get_message_lang +from mycroft.skills.intent_services.adapt_service import (ContextManager, + AdaptIntent) from test.util import base_config