mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
scripts: Fix encoding errors for python3
Moved call of decode('utf-8') as close as possible to
call of subprocess API to avoid calling it in a lot of
other places.
Decoded binary data to utf-8 where appropriate to fix devtool
and recipetool tests in python 3 environment.
(From OE-Core rev: 30d02e2aa2d42fdf76271234b2dc9f37bc46b250)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ed7abe6b9a
commit
3ee70cb725
@@ -851,14 +851,14 @@ def crunch_license(licfile):
|
||||
continue
|
||||
# Squash spaces, and replace smart quotes, double quotes
|
||||
# and backticks with single quotes
|
||||
line = oe.utils.squashspaces(line.strip()).decode("utf-8")
|
||||
line = oe.utils.squashspaces(line.strip())
|
||||
line = line.replace(u"\u2018", "'").replace(u"\u2019", "'").replace(u"\u201c","'").replace(u"\u201d", "'").replace('"', '\'').replace('`', '\'')
|
||||
if line:
|
||||
lictext.append(line)
|
||||
|
||||
m = hashlib.md5()
|
||||
try:
|
||||
m.update(' '.join(lictext))
|
||||
m.update(' '.join(lictext).encode('utf-8'))
|
||||
md5val = m.hexdigest()
|
||||
except UnicodeEncodeError:
|
||||
md5val = None
|
||||
|
||||
Reference in New Issue
Block a user