[oe-commits] Richard Purdie : fixup

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: d9b3923d1db67bab30afea83860bb51c5a3d4c24
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d9b3923d1db67bab30afea83860bb51c5a3d4c24

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu May  9 09:44:17 2013 +0100

fixup

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/kernel-module-split.bbclass |    2 +-
 meta/lib/oe/prservice.py                 |    2 +-
 meta/lib/oe/qa.py                        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass
index 23714d5..9a4329d 100644
--- a/meta/classes/kernel-module-split.bbclass
+++ b/meta/classes/kernel-module-split.bbclass
@@ -153,7 +153,7 @@ python split_kernel_module_packages () {
         files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename)
         d.setVar('FILES_%s' % pkg, files)
 
-        if vals.has_key("description"):
+        if "description" in vals:
             old_desc = d.getVar('DESCRIPTION_' + pkg, True) or ""
             d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"])
 
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py
index 27883a7..b0cbcb1 100644
--- a/meta/lib/oe/prservice.py
+++ b/meta/lib/oe/prservice.py
@@ -101,7 +101,7 @@ def prserv_export_tofile(d, metainfo, datainfo, lockdown, nomax=False):
         for i in range(len(datainfo)):
             pkgarch = datainfo[i]['pkgarch']
             value = datainfo[i]['value']
-            if not idx.has_key(pkgarch):
+            if pkgarch not in idx:
                 idx[pkgarch] = i
             elif value > datainfo[idx[pkgarch]]['value']:
                 idx[pkgarch] = i
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index c4376f0..d5cdaa0 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -93,7 +93,7 @@ class ELFFile:
         import bb.process
         import sys
 
-        if self.objdump_output.has_key(cmd):
+        if cmd in self.objdump_output:
             return self.objdump_output[cmd]
 
         objdump = d.getVar('OBJDUMP', True)