aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 12:16:08 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 15:57:31 +1200
commit1553d287a9c29f38d7754390fb8e2f05607ca5f4 (patch)
tree41b319a7f35f70b5fbf17f1fd114526c13908ac2
parent334999487abd3ccf9eadde88c2b9486455325a90 (diff)
downloadmeta-opie-1553d287a9c29f38d7754390fb8e2f05607ca5f4.zip
meta-opie-1553d287a9c29f38d7754390fb8e2f05607ca5f4.tar.gz
meta-opie-1553d287a9c29f38d7754390fb8e2f05607ca5f4.tar.bz2
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 <paul.eggleton@linux.intel.com>
-rw-r--r--classes/opie.bbclass2
-rw-r--r--recipes-opie/opie-reader/opie-reader.inc4
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,