[gnome-continuous-yocto/gnomeostree-3.28-rocko: 294/8267] wic: don't encode unicode strings

[Emmanuele Bassi <ebassi src gnome org>]

commit dd732eeedd646363007bde0764d73d419613d9f6
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed May 4 16:06:26 2016 +0300

    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>

 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 2340ac2..4d8e704 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')