From 7cad2c6788113f9b3e60846323e9bf3da60cc531 Mon Sep 17 00:00:00 2001 From: Hilton Bristow Date: Tue, 24 Dec 2013 15:15:06 +1000 Subject: [PATCH] fixed relative imports in Jinja for python3 --- 3rdparty/jinja2/markupsafe/__init__.py | 4 ++-- 3rdparty/jinja2/markupsafe/_native.py | 2 +- 3rdparty/jinja2/utils.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/3rdparty/jinja2/markupsafe/__init__.py b/3rdparty/jinja2/markupsafe/__init__.py index f13d707..a602dd5 100644 --- 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 --- 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 --- 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 -- 2.7.4