[clang-scan-view] Force utf-8 when handling report (python2 only)

Original patch by random human <random.bored.human@gmail.com>

Differential Revision: https://reviews.llvm.org/D64129

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@366194 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/scan-view/share/ScanView.py b/tools/scan-view/share/ScanView.py
index c40366b2e849057dd333d2efcac040c97f982a94..a6cc7692ffe0038e25eeb49deba53dc4b251bc8d 100644 (file)
--- a/tools/scan-view/share/ScanView.py
+++ b/tools/scan-view/share/ScanView.py
@@ -764,11 +764,11 @@ File Bug</h3>
             variables['report'] = m.group(2)
 
         try:
-            f = open(path,'r')
+            f = open(path,'rb')
         except IOError:
             return self.send_404()
         fs = os.fstat(f.fileno())
-        data = f.read()
+        data = f.read().decode('utf-8')
         for a,b in kReportReplacements:
             data = a.sub(b % variables, data)
         return self.send_string(data, ctype, mtime=fs.st_mtime)