From 81e3acd599d06a90c312a74e8ad4d6a4208fe9ee Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 16 Dec 2019 18:16:26 +1000 Subject: [PATCH] fixes cycles in template imports --- anki/template/__init__.py | 5 +++-- anki/template/template.py | 2 -- anki/template/view.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/anki/template/__init__.py b/anki/template/__init__.py index 955518123..291b3e0e2 100644 --- a/anki/template/__init__.py +++ b/anki/template/__init__.py @@ -1,5 +1,6 @@ -from anki.template.template import Template -from anki.template.view import View +from .template import Template +from . import furigana; furigana.install() +from . import hint; hint.install() def render(template, context=None, **kwargs): context = context and context.copy() or {} diff --git a/anki/template/template.py b/anki/template/template.py index 71179547f..ad53d47e9 100644 --- a/anki/template/template.py +++ b/anki/template/template.py @@ -1,8 +1,6 @@ import re from anki.utils import stripHTML, stripHTMLMedia from anki.hooks import runFilter -from anki.template import furigana; furigana.install() -from anki.template import hint; hint.install() clozeReg = r"(?si)\{\{(c)%s::(.*?)(::(.*?))?\}\}" diff --git a/anki/template/view.py b/anki/template/view.py index c98520c84..99110e071 100644 --- a/anki/template/view.py +++ b/anki/template/view.py @@ -1,4 +1,4 @@ -from anki.template import Template +from .template import Template import os.path import re