fix(renderer): allow unicode for no-escape variables

diff --git a/chevron/renderer.py b/chevron/renderer.py
index 0a65bd0469b92731c0019a92bfae67fcac437a48..4286f5bd5c1768430882d870f5f31942ead35d1c 100644 (file)
--- a/chevron/renderer.py
+++ b/chevron/renderer.py
@@ -203,7 +203,10 @@ def render(template='', data={}, partials_path='.', partials_ext='mustache',
         # If we're a no html escape tag
         elif tag == 'no escape':
             # Just lookup the key and add it
-            output += str(_get_key(key, scopes))
+            thing = _get_key(key, scopes)
+            if type(thing) != unicode:
+                thing = unicode(str(thing), 'utf-8')
+            output += thing
 
         # If we're a section tag
         elif tag == 'section':

diff --git a/tests/data.json b/tests/data.json
index 4be713946942ac01cdf725c0363e36e23580619b..02f0451d4430761942ec0257c07ae239e73662c5 100644 (file)
--- a/tests/data.json
+++ b/tests/data.json
@@ -12,5 +12,6 @@
   "scope": {
       "test": "new test"
   },
-  "unicode": "(╯°□°）╯︵ ┻━┻"
+  "unicode": "(╯°□°）╯︵ ┻━┻",
+  "unicode_html": "<a>(╯°□°）╯︵ ┻━┻"
 }

diff --git a/tests/test.mustache b/tests/test.mustache
index 6a507e96de3450aae444a6f72dc33e1b9c777a33..61cca181914a60d683602f132560da1ecd4f8191 100644 (file)
--- a/tests/test.mustache
+++ b/tests/test.mustache
@@ -140,3 +140,10 @@ unicode test (partial)
 ===
 (╯°□°）╯︵ ┻━┻
 ===
+
+unicode test (no-escape)
+===
+{{& unicode_html }}
+===
+<a>(╯°□°）╯︵ ┻━┻
+===

diff --git a/tests/test.rendered b/tests/test.rendered
index 730bec2e653a2c77682634df7262c695334ec103..9861850c29e66a114bd451da4f489683ce566d14 100644 (file)
--- a/tests/test.rendered
+++ b/tests/test.rendered
@@ -124,3 +124,10 @@ unicode test (partial)
 ===
 (╯°□°）╯︵ ┻━┻
 ===
+
+unicode test (no-escape)
+===
+<a>(╯°□°）╯︵ ┻━┻
+===
+<a>(╯°□°）╯︵ ┻━┻
+===