import Markup from markupsafe, fix flake8 import warnings

1 files changed, 4 insertions, 3 deletions

diff --git a/src/jinja2/__init__.py b/src/jinja2/__init__.py
index 9c4c9cfc..8149c702 100644
--- a/src/jinja2/__init__.py
+++ b/src/jinja2/__init__.py
@@ -3,6 +3,9 @@
 non-XML syntax that supports inline expressions and an optional
 sandboxed environment.
 """
+from markupsafe import escape
+from markupsafe import Markup
+
 from .bccache import BytecodeCache
 from .bccache import FileSystemBytecodeCache
 from .bccache import MemcachedBytecodeCache
@@ -34,10 +37,8 @@ from .runtime import Undefined
 from .utils import clear_caches
 from .utils import contextfunction
 from .utils import environmentfunction
-from .utils import escape
 from .utils import evalcontextfunction
 from .utils import is_undefined
-from .utils import Markup
 from .utils import select_autoescape
 
-__version__ = "2.11.0.dev0"
+__version__ = "2.11.0rc2"