This revision was automatically updated to reflect the committed changes. Closed by commit rL366194: [clang-scan-view] Force utf-8 when handling report (python2 only) (authored by serge_sans_paille, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D64129?vs=207752&id=210046#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D64129/new/ https://reviews.llvm.org/D64129 Files: cfe/trunk/tools/scan-view/share/ScanView.py Index: cfe/trunk/tools/scan-view/share/ScanView.py =================================================================== --- cfe/trunk/tools/scan-view/share/ScanView.py +++ cfe/trunk/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: cfe/trunk/tools/scan-view/share/ScanView.py =================================================================== --- cfe/trunk/tools/scan-view/share/ScanView.py +++ cfe/trunk/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