RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-18 10:32:48 +02:00
Code Issues Projects Releases Wiki Activity

[opt viewer] Python compat - decode/encode string

Browse Source 
Summary:
Use io.open instead of codecs.open according to here
https://stackoverflow.com/questions/10971033/backporting-python-3-openencoding-utf-8-to-python-2

Add `u` prefix to string literal to make them utf-8 in python2.

Reviewers: anemet, serge-sans-paille

Reviewed by: serge-sans-paille

Differential Revision: https://reviews.llvm.org/D73011
This commit is contained in:
Yuanfang Chen 2020-01-19 17:52:08 -08:00
parent d1ce1f7a0b
commit 0403252429
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/opt-viewer/opt-viewer.py
View File

@ -4,9 +4,9 @@ from __future__ import print_function
import argparse
import cgi
import codecs
import errno
import functools
import io
from multiprocessing import cpu_count
import os.path
import re
@ -54,12 +54,12 @@ class SourceFileRenderer:
existing_filename = fn
self.no_highlight = no_highlight
self.stream = codecs.open(os.path.join(output_dir, optrecord.html_file_name(filename)), 'w', encoding='utf-8')
self.stream = io.open(os.path.join(output_dir, optrecord.html_file_name(filename)), 'w', encoding='utf-8')
if existing_filename:
self.source_stream = open(existing_filename)
self.source_stream = io.open(existing_filename, encoding='utf-8')
else:
self.source_stream = None
print('''
print(u'''
<html>
<h1>Unable to locate file {}</h1>
</html>
@ -72,10 +72,7 @@ class SourceFileRenderer:
file_text = stream.read()
if self.no_highlight:
if sys.version_info.major >= 3:
html_highlighted = file_text
else:
html_highlighted = file_text.decode('utf-8')
html_highlighted = file_text
else:
html_highlighted = highlight(
file_text,
@ -147,7 +144,7 @@ class SourceFileRenderer:
if not self.source_stream:
return
print('''
print(u'''
<html>
<title>{}</title>
<meta charset="utf-8" />
@ -186,7 +183,7 @@ function toggleExpandedMessage(e) {{
<tbody>'''.format(os.path.basename(self.filename)), file=self.stream)
self.render_source_lines(self.source_stream, line_remarks)
print('''
print(u'''
</tbody>
</table>
</body>
@ -195,7 +192,7 @@ function toggleExpandedMessage(e) {{
class IndexRenderer:
def __init__(self, output_dir, should_display_hotness, max_hottest_remarks_on_index):
self.stream = codecs.open(os.path.join(output_dir, 'index.html'), 'w', encoding='utf-8')
self.stream = io.open(os.path.join(output_dir, 'index.html'), 'w', encoding='utf-8')
self.should_display_hotness = should_display_hotness
self.max_hottest_remarks_on_index = max_hottest_remarks_on_index
@ -210,7 +207,7 @@ class IndexRenderer:
</tr>'''.format(**locals()), file=self.stream)
def render(self, all_remarks):
print('''
print(u'''
<html>
<meta charset="utf-8" />
<head>
@ -233,7 +230,7 @@ class IndexRenderer:
for i, remark in enumerate(all_remarks[:max_entries]):
if not suppress(remark):
self.render_entry(remark, i % 2)
print('''
print(u'''
</table>
</body>
</html>''', file=self.stream)

3
tools/opt-viewer/optrecord.py
View File

@ -2,6 +2,7 @@
from __future__ import print_function
import io
import yaml
# Try to use the C parser.
try:
@ -272,7 +273,7 @@ def get_remarks(input_file, filter_=None):
all_remarks = dict()
file_remarks = defaultdict(functools.partial(defaultdict, list))
with open(input_file) as f:
with io.open(input_file, encoding = 'utf-8') as f:
docs = yaml.load_all(f, Loader=Loader)
filter_e = None