MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2671 from MycroftAI/remove/dialog-loader 

remove deprecated DialogLoader class
pull/2678/head
Kris Gesling 2020-08-21 00:31:45 +00:00 committed by GitHub
parent d1ea9088fb 2643caadf8
commit cb2531c81c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mycroft/dialog/__init__.py
View File

@ -14,5 +14,4 @@
# #
"""Provides utilities for rendering dialogs and populating with custom data.""" """Provides utilities for rendering dialogs and populating with custom data."""
from .dialog import (MustacheDialogRenderer, DialogLoader, from .dialog import (MustacheDialogRenderer, load_dialogs, get)
load_dialogs, get)

22
mycroft/dialog/dialog.py
View File

@ -120,28 +120,6 @@ class MustacheDialogRenderer:
return line return line
class DialogLoader:
"""Loads a collection of dialog files into a renderer implementation.
TODO: Remove in 20.02
"""
def __init__(self, renderer_factory=MustacheDialogRenderer):
LOG.warning('Deprecated, use load_dialogs() instead.')
self.__renderer = renderer_factory()
def load(self, dialog_dir):
"""Load all dialog files within the specified directory.
Args:
dialog_dir (str): directory that contains dialog files
Returns:
a loaded instance of a dialog renderer
"""
return load_dialogs(dialog_dir, self.__renderer)
def load_dialogs(dialog_dir, renderer=None): def load_dialogs(dialog_dir, renderer=None):
"""Load all dialog files within the specified directory. """Load all dialog files within the specified directory.

8
test/unittests/dialog/test_dialog.py
View File

@ -17,7 +17,7 @@ import unittest
import pathlib import pathlib
import json import json
from mycroft.dialog import MustacheDialogRenderer, DialogLoader, get from mycroft.dialog import MustacheDialogRenderer, load_dialogs, get
from mycroft.util import resolve_resource_file from mycroft.util import resolve_resource_file
@ -90,15 +90,13 @@ class DialogTest(unittest.TestCase):
def test_dialog_loader(self): def test_dialog_loader(self):
template_path = self.topdir.joinpath('./multiple_dialogs') template_path = self.topdir.joinpath('./multiple_dialogs')
loader = DialogLoader() renderer = load_dialogs(template_path)
renderer = loader.load(template_path)
self.assertEqual(renderer.render('one'), 'ONE') self.assertEqual(renderer.render('one'), 'ONE')
self.assertEqual(renderer.render('two'), 'TWO') self.assertEqual(renderer.render('two'), 'TWO')
def test_dialog_loader_missing(self): def test_dialog_loader_missing(self):
template_path = self.topdir.joinpath('./missing_dialogs') template_path = self.topdir.joinpath('./missing_dialogs')
loader = DialogLoader() renderer = load_dialogs(template_path)
renderer = loader.load(template_path)
self.assertEqual(renderer.render('test'), 'test') self.assertEqual(renderer.render('test'), 'test')
def test_get(self): def test_get(self):