Merge pull request #53 from edx/nate/fix-mako-templ-encoding

Specify UTF-8 encoding when loading Mako template
2013-06-04 13:02:05 -07:00
parent 5baee34896 64a85e19e7
commit b606d7ce56
1 changed files with 5 additions and 1 deletions
--- a/common/djangoapps/mitxmako/makoloader.py
+++ b/common/djangoapps/mitxmako/makoloader.py
@@ -44,7 +44,11 @@ class MakoLoader(object):

        if source.startswith("## mako\n"):
            # This is a mako template
-            template = Template(filename=file_path, module_directory=self.module_directory, uri=template_name)
+            template = Template(filename=file_path,
+                                module_directory=self.module_directory,
+                                input_encoding='utf-8',
+                                output_encoding='utf-8',
+                                uri=template_name)
            return template, None
        else:
            # This is a regular template