- [bug] Fixed bug whereby an exception in Python 3

  against a module compiled to the filesystem would
  fail trying to produce a RichTraceback due to the
  content being in bytes. [ticket:209]

4 files changed, 29 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index d19cbdf..f93cd74 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 0.7.4
+- [bug] Fixed bug whereby an exception in Python 3
+  against a module compiled to the filesystem would
+  fail trying to produce a RichTraceback due to the
+  content being in bytes. [ticket:209]
+
 - [bug] Change default for compile()->reserved_names
   from tuple to frozenset, as this is expected to be
   a set by default.  [ticket:208]
diff --git a/mako/template.py b/mako/template.py
index f140a08..9c64987 100644
--- a/mako/template.py
+++ b/mako/template.py
@@ -601,7 +601,7 @@ class ModuleInfo(object):
         if self.module_source is not None:
             return self.module_source
         else:
-            return util.read_file(self.module_filename)
+            return util.read_python_file(self.module_filename)
 
     @property
     def source(self):
diff --git a/mako/util.py b/mako/util.py
index f54fda2..87be71b 100644
--- a/mako/util.py
+++ b/mako/util.py
@@ -353,6 +353,17 @@ def read_file(path, mode='rb'):
     finally:
         fp.close()
 
+def read_python_file(path):
+    fp = open(path, "rb")
+    try:
+        encoding = parse_encoding(fp)
+        data = fp.read()
+        if encoding:
+            data = data.decode(encoding)
+        return data
+    finally:
+        fp.close()
+
 def load_module(module_id, path):
     fp = open(path, 'rb')
     try:
diff --git a/test/test_exceptions.py b/test/test_exceptions.py
index 012f76f..74bc34c 100644
--- a/test/test_exceptions.py
+++ b/test/test_exceptions.py
@@ -282,7 +282,7 @@ ${foobar}
         # isn't in the 'wrong' exception
         assert "".join(reversed(");93#&rab;93#&(oof")) in html_error
 
-    def test_tback_no_trace(self):
+    def test_tback_no_trace_from_py_file(self):
         try:
             t = self._file_template("runtimeerr.html")
             t.render()
@@ -297,3 +297,14 @@ ${foobar}
         html_error = exceptions.html_error_template().\
                     render_unicode(error=v, traceback=None)
         assert "local variable 'y' referenced before assignment" in html_error
+
+    def test_tback_trace_from_py_file(self):
+        t = self._file_template("runtimeerr.html")
+        try:
+            t.render()
+            assert False
+        except:
+            html_error = exceptions.html_error_template().\
+                        render_unicode()
+
+        assert "local variable 'y' referenced before assignment" in html_error