From 1553d287a9c29f38d7754390fb8e2f05607ca5f4 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Sun, 12 Jun 2016 12:16:08 +1200 Subject: Fixes for Python 3 OE-Core master now requires Python 3 so we need to ensure Python code here is compatible. Signed-off-by: Paul Eggleton --- classes/opie.bbclass | 2 +- recipes-opie/opie-reader/opie-reader.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/opie.bbclass b/classes/opie.bbclass index 21dc581..f3edaf6 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -62,7 +62,7 @@ fakeroot python opie_do_opie_install() { "Networksettings" : ( "/plugins/networksettings", None ) } if section not in dirmap: - raise ValueError, "Unknown section '%s'. Valid sections are: %s" % ( section, dirmap.keys() ) + raise ValueError("Unknown section '%s'. Valid sections are: %s" % ( section, dirmap.keys() )) bindir, desktopdir = dirmap[section] APPNAME = bb.data.getVar( "APPNAME", d, True ) or bb.data.getVar( "PN", d, True ) diff --git a/recipes-opie/opie-reader/opie-reader.inc b/recipes-opie/opie-reader/opie-reader.inc index 9a2ce76..b707167 100644 --- a/recipes-opie/opie-reader/opie-reader.inc +++ b/recipes-opie/opie-reader/opie-reader.inc @@ -53,8 +53,8 @@ do_install() { } python populate_packages_prepend () { - print "opie-reader:", bb.data.getVar( 'RDEPENDS_opie-reader', d ) - plugindir = bb.data.expand('${palmtopdir}/plugins/reader', d) + print("opie-reader:" % d.getVar( 'RDEPENDS_opie-reader' )) + plugindir = d.expand('${palmtopdir}/plugins/reader') for dir, type in [ ( 'codecs', 'codec' ), ( 'filters', 'filter' ), ( 'outcodecs', 'output' ) ]: dir = plugindir + '/' + dir do_split_packages(d, dir, -- cgit 1.2.3-korg