[gnome-continuous-yocto/gnomeostree-3.28-rocko: 635/8267] bitbake: toaster: use decode('utf-8') for binary data

[Emmanuele Bassi <ebassi src gnome org>]

commit 96ce54315056ddba15b67d943a3778181b765bce
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue May 10 15:28:50 2016 +0300

    bitbake: toaster: use decode('utf-8') for binary data
    
    Decoded binary data to utf-8 to fix the following
    error when runnign on python 3:
    TypeError: Type str doesn't support the buffer API
    
    [YOCTO #9584]
    
    (Bitbake rev: 752ea00919ef054622a51ce097923309934eff2b)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../toaster/bldcontrol/localhostbecontroller.py    |    2 +-
 .../bldcontrol/management/commands/loadconf.py     |    2 +-
 bitbake/lib/toaster/orm/models.py                  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py 
b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index b4e4196..3da8be4 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -70,7 +70,7 @@ class LocalhostBEController(BuildEnvironmentController):
             raise ShellCmdException(err)
         else:
             logger.debug("localhostbecontroller: shellcmd success")
-            return out
+            return out.decode('utf-8')
 
     def getGitCloneDirectory(self, url, branch):
         """Construct unique clone directory name out of url and branch."""
diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py 
b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
index 6d25df9..173e3ce 100644
--- a/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
+++ b/bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
@@ -54,7 +54,7 @@ class Command(BaseCommand):
             (out,err) = cmd.communicate()
             if cmd.returncode != 0:
                 logging.warning("Error while importing layer vcs_url: git error: %s" % err)
-            for line in out.split("\n"):
+            for line in out.decode('utf-8').split("\n"):
                 try:
                     (name, path) = line.split("\t", 1)
                     if name == remote_name:
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 9183b0c..58dc753 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1169,7 +1169,7 @@ class LayerIndexLayerSource(LayerSource):
             except URLError as e:
                 raise Exception("Failed to read %s: %s" % (path, e.reason))
 
-            return json.loads(res.read())
+            return json.loads(res.read().decode('utf-8'))
 
         # verify we can get the basic api
         try: