diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-04 16:06:26 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 23:05:14 +0100 |
| commit | dd732eeedd646363007bde0764d73d419613d9f6 (patch) | |
| tree | 7ba10e7cf743e5690d5ae67fe8df96462e4a921f /scripts/lib/wic | |
| parent | a173885ccfcff1099fa47c0f84913d14ac26079f (diff) | |
| download | openembedded-core-contrib-dd732eeedd646363007bde0764d73d419613d9f6.tar.gz | |
wic: don't encode unicode strings
Removed check for unicode type as it doesn't work in Python 3.
This check is not needed for wic as all its output seem to be
strings. This allows to run code under both pythons.
[YOCTO #9412]
(From OE-Core rev: a56924b4a0102e401b5e37d857a08bab15da974e)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic')
| -rw-r--r-- | scripts/lib/wic/msger.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/scripts/lib/wic/msger.py b/scripts/lib/wic/msger.py index 2340ac2f10..4d8e704172 100644 --- a/scripts/lib/wic/msger.py +++ b/scripts/lib/wic/msger.py @@ -66,10 +66,6 @@ def _general_print(head, color, msg=None, stream=None, level='normal'): # skip return - # encode raw 'unicode' str to utf8 encoded str - if msg and isinstance(msg, unicode): - msg = msg.encode('utf-8', 'ignore') - errormsg = '' if CATCHERR_BUFFILE_FD > 0: size = os.lseek(CATCHERR_BUFFILE_FD, 0, os.SEEK_END) @@ -118,9 +114,6 @@ def _color_print(head, color, msg, stream, level): newline = True if msg is not None: - if isinstance(msg, unicode): - msg = msg.encode('utf8', 'ignore') - stream.write('%s%s' % (head, msg)) if newline: stream.write('\n') |