serge-sans-paille created this revision. serge-sans-paille added a reviewer: michaelplatings. Herald added a project: clang. Herald added a subscriber: cfe-commits.
If the report file contains unicode characters, under Python2, opening the file does not decode it to utf-8 by default. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D64129 Files: clang/tools/scan-view/share/ScanView.py Index: clang/tools/scan-view/share/ScanView.py =================================================================== --- clang/tools/scan-view/share/ScanView.py +++ clang/tools/scan-view/share/ScanView.py @@ -764,11 +764,11 @@ 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)
Index: clang/tools/scan-view/share/ScanView.py =================================================================== --- clang/tools/scan-view/share/ScanView.py +++ clang/tools/scan-view/share/ScanView.py @@ -764,11 +764,11 @@ 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)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits