derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: Explicitly decode/encode in utf-8.

Browse Source 
The default encoding for python 2 is ascii which can't handle some
characters in, for instance, people's names which have accented letters.
This change explicitly selects the utf-8 encoding which pacifies python
and is mostly equivalent except in these rare cases.

In python 3, the default encoding is utf-8 to begin with, and it's no
longer possible to change it. In this case, explicitly selecting the
encoding is redundant but harmless.

When we support only python 3, then this change can be reverted.

Thanks to Lakin Smith for proposing a related solution and pointing out
some information that led to this one.

Change-Id: I99bd59063c77edd712954ffe90d7de320ade49ea
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33575
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Lakin Smith <lakindsmith@gmail.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
This commit is contained in:
Gabe Black
2020-08-27 01:52:04 -07:00
parent 94000aefe6
commit 52f392b947
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
util/git-pre-commit.py
View File

@@ -79,7 +79,7 @@ for status, fname in git.status(filter="MA", cached=True):
# Show they appropriate object and dump it to a file
status = git.file_from_index(fname)
f = TemporaryFile()
f.write(status.encode())
f.write(status.encode('utf-8'))
verifiers = [ v(ui, opts, base=repo_base) for v in all_verifiers ]
for v in verifiers:

6
util/style/repo.py
View File

@@ -186,7 +186,7 @@ class GitRepo(AbstractRepo):
if filter:
cmd += [ "--diff-filter=%s" % filter ]
cmd += [ self.head_revision(), "--" ] + files
status = subprocess.check_output(cmd).decode().rstrip("\n")
status = subprocess.check_output(cmd).decode('utf-8').rstrip("\n")
if status:
return [ f.split("\t") for f in status.split("\n") ]
@@ -195,12 +195,12 @@ class GitRepo(AbstractRepo):
def file_from_index(self, name):
return subprocess.check_output(
[ self.git, "show", ":%s" % (name, ) ]).decode()
[ self.git, "show", ":%s" % (name, ) ]).decode('utf-8')
def file_from_head(self, name):
return subprocess.check_output(
[ self.git, "show", "%s:%s" % (self.head_revision(), name) ]) \
.decode()
.decode('utf-8')
def detect_repo(path="."):
"""Auto-detect the revision control system used for a source code

4
util/style/verifiers.py
View File

@@ -239,7 +239,7 @@ class LineVerifier(Verifier):
for num,line in enumerate(fobj):
if num not in regions:
continue
s_line = line.decode().rstrip('\n')
s_line = line.decode('utf-8').rstrip('\n')
if not self.check_line(s_line, language=lang):
if not silent:
self.ui.write("invalid %s in %s:%d\n" % \
@@ -351,7 +351,7 @@ class SortedIncludes(Verifier):
close = True
norm_fname = self.normalize_filename(filename)
old = [ l.decode().rstrip('\n') for l in fobj ]
old = [ l.decode('utf-8').rstrip('\n') for l in fobj ]
if close:
fobj.close()