Fix issue with

UnicodeDecodeError: 'ascii' codec can't decode byte 0xd0 in position 0: ordinal not in range(128) when rendering template within non-ASCII strings (non-unicodes)
vintozver · Oct 3, 2012 · 17af9b5 · 17af9b5
1 parent 21a2010
commit 17af9b5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/jinja2/_markupsafe/_native.py b/jinja2/_markupsafe/_native.py
@@ -40,6 +40,8 @@ def soft_unicode(s):
     """Make a string unicode if it isn't already.  That way a markup
     string is not converted back to unicode.
     """
+    if isinstance(s, str):
+        s = s.decode('utf-8')
     if not isinstance(s, unicode):
         s = unicode(s)
     return s