Skip to content
This repository has been archived by the owner on Sep 8, 2024. It is now read-only.

remove deprecated DialogLoader class #2671

Merged
merged 1 commit into from
Aug 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mycroft/dialog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@
#
"""Provides utilities for rendering dialogs and populating with custom data."""

from .dialog import (MustacheDialogRenderer, DialogLoader,
load_dialogs, get)
from .dialog import (MustacheDialogRenderer, load_dialogs, get)
22 changes: 0 additions & 22 deletions mycroft/dialog/dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,28 +120,6 @@ def render(self, template_name, context=None, index=None):
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):
"""Load all dialog files within the specified directory.

Expand Down
8 changes: 3 additions & 5 deletions test/unittests/dialog/test_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import pathlib
import json

from mycroft.dialog import MustacheDialogRenderer, DialogLoader, get
from mycroft.dialog import MustacheDialogRenderer, load_dialogs, get
from mycroft.util import resolve_resource_file


Expand Down Expand Up @@ -90,15 +90,13 @@ def test_comment_dialog(self):

def test_dialog_loader(self):
template_path = self.topdir.joinpath('./multiple_dialogs')
loader = DialogLoader()
renderer = loader.load(template_path)
renderer = load_dialogs(template_path)
self.assertEqual(renderer.render('one'), 'ONE')
self.assertEqual(renderer.render('two'), 'TWO')

def test_dialog_loader_missing(self):
template_path = self.topdir.joinpath('./missing_dialogs')
loader = DialogLoader()
renderer = loader.load(template_path)
renderer = load_dialogs(template_path)
self.assertEqual(renderer.render('test'), 'test')

def test_get(self):
Expand Down