Ticket #6932: patch.diff

trac/web/main.py

@@ -464 +464 @@
                         lineno = tb.tb_lineno - 1
                         before, line, after = get_lines_from_file(filename,
                                                                   lineno, 5)
-                        frames += [{'traceback': tb, 'filename': filename,
+                        frames += [{'traceback': tb,
+                                    'filename': to_unicode(filename),
                                     'lineno': lineno, 'line': line,
                                     'lines_before': before, 'lines_after': after,
                                     'function': tb.tb_frame.f_code.co_name,

trac/util/__init__.py

@@ -141 +141 @@
     `lineno` from the file identified by `filename`.
     
     Returns a `(lines_before, line, lines_after)` tuple.
+    `lines_before`, `line` and `lines_after` are returned by using to_unicode()
     """
     if os.path.isfile(filename):
         fileobj = open(filename, 'U')
@@ -149 +150 @@
             lbound = max(0, lineno - context)
             ubound = lineno + 1 + context
 
-            before = [l.rstrip('\n') for l in lines[lbound:lineno]]
-            line = lines[lineno].rstrip('\n')
-            after = [l.rstrip('\n') for l in lines[lineno + 1:ubound]]
+            before = [to_unicode(l.rstrip('\n')) for l in lines[lbound:lineno]]
+            line = to_unicode(lines[lineno].rstrip('\n'))
+            after = [to_unicode(l.rstrip('\n')) \
+                        for l in lines[lineno + 1:ubound]]
 
             return before, line, after
         finally: