fixed relative imports in Jinja for python3

diff --git a/3rdparty/jinja2/markupsafe/__init__.py b/3rdparty/jinja2/markupsafe/__init__.py
index f13d707..a602dd5 100644 (file)
--- a/3rdparty/jinja2/markupsafe/__init__.py
+++ b/3rdparty/jinja2/markupsafe/__init__.py
@@ -9,7 +9,7 @@
     :license: BSD, see LICENSE for more details.
 """
 import re
-from _compat import text_type, string_types, int_types, \
+from ._compat import text_type, string_types, int_types, \
      unichr, PY2
 
 
@@ -227,7 +227,7 @@ class _MarkupEscapeHelper(object):
 try:
     from _speedups import escape, escape_silent, soft_unicode
 except ImportError:
-    from _native import escape, escape_silent, soft_unicode
+    from ._native import escape, escape_silent, soft_unicode
 
 if not PY2:
     soft_str = soft_unicode

diff --git a/3rdparty/jinja2/markupsafe/_native.py b/3rdparty/jinja2/markupsafe/_native.py
index 4b4aee3..81d0777 100644 (file)
--- a/3rdparty/jinja2/markupsafe/_native.py
+++ b/3rdparty/jinja2/markupsafe/_native.py
@@ -8,7 +8,7 @@
     :copyright: (c) 2010 by Armin Ronacher.
     :license: BSD, see LICENSE for more details.
 """
-from _compat import text_type
+from ._compat import text_type
 
 
 def escape(s):

diff --git a/3rdparty/jinja2/utils.py b/3rdparty/jinja2/utils.py
index ddc47da..cbea660 100644 (file)
--- a/3rdparty/jinja2/utils.py
+++ b/3rdparty/jinja2/utils.py
@@ -517,4 +517,4 @@ class Joiner(object):
 
 
 # Imported here because that's where it was in the past
-from markupsafe import Markup, escape, soft_unicode
+from .markupsafe import Markup, escape, soft_unicode