Merge pull request #29 from lksnmnn/fix-utf8-encoding

fix(renderer): allow unicode for no-escape variables
noahmorrison · Jun 16, 2018 · 61e2d5a · 61e2d5a
2 parents 8dbc2cb + 87099af
commit 61e2d5a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -12,5 +12,6 @@
   "scope": {
       "test": "new test"
   },
-  "unicode": "(╯°□°）╯︵ ┻━┻"
+  "unicode": "(╯°□°）╯︵ ┻━┻",
+  "unicode_html": "<a>(╯°□°）╯︵ ┻━┻"
 }
diff --git 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
@@ -124,3 +124,10 @@ unicode test (partial)
 ===
 (╯°□°）╯︵ ┻━┻
 ===
+
+unicode test (no-escape)
+===
+<a>(╯°□°）╯︵ ┻━┻
+===
+<a>(╯°□°）╯︵ ┻━┻
+===