allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [allura] 02/02: [#8333] better unicode fix for side-by-side diffs
Date Fri, 31 Jan 2020 16:11:51 GMT
This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 1ae27859e9448ed74cc6bdcb3c7e2e9bc4e80b92
Author: Dave Brondsema <dave@brondsema.net>
AuthorDate: Fri Jan 31 11:11:20 2020 -0500

    [#8333] better unicode fix for side-by-side diffs
---
 Allura/allura/lib/diff.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Allura/allura/lib/diff.py b/Allura/allura/lib/diff.py
index ae46742..b3c82e0 100644
--- a/Allura/allura/lib/diff.py
+++ b/Allura/allura/lib/diff.py
@@ -58,7 +58,7 @@ class HtmlSideBySideDiff(object):
     def _preprocess(self, line):
         if not line:
             return line
-        line = six.ensure_text(line).expandtabs(self._tabsize)
+        line = h.really_unicode(line).expandtabs(self._tabsize)
         return line.replace('&', '&amp;').replace('<', '&lt;').replace('>',
'&gt;')
 
     def _replace_marks(self, line):


Mime
View raw message