[gnome-continuous-yocto/gnomeostree-3.28-rocko: 810/8267] npm.bbclass: avoid str/byte conversion problems for PKGV and SUMMARY

[Emmanuele Bassi <ebassi src gnome org>]

commit 21343ac500395e13b9b2e5ccab95543ca2a9cd8b
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri Jun 10 10:04:51 2016 +0200

    npm.bbclass: avoid str/byte conversion problems for PKGV and SUMMARY
    
    In Python3, str.encode() returns byte strings, which later are not
    converted back to strings automatically, leading to "TypeError: Can't
    convert 'bytes' object to str implicitly" in code which reads PKGV and
    SUMMARY and expects to find strings there.
    
    The npm.bbclass must use values for d.setVar() that meet that
    expectation, and thus the redundant (and in Python3, harmful)
    .encode() gets removed.
    
    (From OE-Core rev: 241e094bcd9212204350f9855257474908f82a3c)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/npm.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index d0d3d8f..95be751 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -46,10 +46,10 @@ python populate_packages_prepend () {
         if pdata:
             version = pdata.get('version', None)
             if version:
-                d.setVar('PKGV_%s' % expanded_pkgname, version.encode("utf8"))
+                d.setVar('PKGV_%s' % expanded_pkgname, version)
             description = pdata.get('description', None)
             if description:
-                d.setVar('SUMMARY_%s' % expanded_pkgname, description.replace(u"\u2018", 
"'").replace(u"\u2019", "'").encode("utf8"))
+                d.setVar('SUMMARY_%s' % expanded_pkgname, description.replace(u"\u2018", 
"'").replace(u"\u2019", "'"))
     d.appendVar('RDEPENDS_%s' % d.getVar('PN', True), ' %s' % ' '.join(pkgnames).replace('_', '-'))
 }