summaryrefslogtreecommitdiff
path: root/jinja2/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'jinja2/__init__.py')
-rw-r--r--jinja2/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/jinja2/__init__.py b/jinja2/__init__.py
index 0eaf721..3ce857a 100644
--- a/jinja2/__init__.py
+++ b/jinja2/__init__.py
@@ -53,9 +53,10 @@ from jinja2.exceptions import TemplateError, UndefinedError, \
# decorators and public utilities
from jinja2.filters import environmentfilter, contextfilter, \
evalcontextfilter
-from jinja2.utils import Markup, escape, clear_caches, \
+from jinja2.utils import clear_caches, \
environmentfunction, evalcontextfunction, contextfunction, \
is_undefined, select_autoescape
+from markupsafe import Markup, escape
__all__ = [
'Environment', 'Template', 'BaseLoader', 'FileSystemLoader',