mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: don't use dict.keys and dict.has_key

Browse Source 
Replaced calls of dict.keys and dict.has_key methods with the
'key in dict' statement. 'key in dict' is more pythonic, faster
and readable. dict.has_key doesn't exist in Python 3.

[YOCTO #9412]

(From OE-Core rev: 003df7dfb932c551953fbf1bd769b3c31bd16fb4)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2016-05-04 16:06:16 +03:00
committed by Richard Purdie
parent e36d04abb7
commit 52ce79dcba
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/wic/imager/baseimager.py
View File

@@ -68,7 +68,7 @@ class BaseImageCreator(object):
} }
# update setting from createopts # update setting from createopts
for key in createopts.keys(): for key in createopts:
if key in optmap: if key in optmap:
option = optmap[key] option = optmap[key]
else: else:

2
scripts/lib/wic/plugin.py
View File

@@ -137,7 +137,7 @@ class PluginMgr(object):
return_methods = None return_methods = None
for _source_name, klass in self.get_plugins('source').items(): for _source_name, klass in self.get_plugins('source').items():
if _source_name == source_name: if _source_name == source_name:
for _method_name in methods.keys(): for _method_name in methods:
if not hasattr(klass, _method_name): if not hasattr(klass, _method_name):
msger.warning("Unimplemented %s source interface for: %s"\ msger.warning("Unimplemented %s source interface for: %s"\
% (_method_name, _source_name)) % (_method_name, _source_name))

6
scripts/lib/wic/utils/partitionedfs.py
View File

@@ -132,7 +132,7 @@ class Image(object):
for num in range(len(self.partitions)): for num in range(len(self.partitions)):
part = self.partitions[num] part = self.partitions[num]
if not self.disks.has_key(part['disk_name']): if part['disk_name'] not in self.disks:
raise ImageError("No disk %s for partition %s" \ raise ImageError("No disk %s for partition %s" \
% (part['disk_name'], part['mountpoint'])) % (part['disk_name'], part['mountpoint']))
@@ -236,7 +236,7 @@ class Image(object):
def __format_disks(self): def __format_disks(self):
self.layout_partitions() self.layout_partitions()
for dev in self.disks.keys(): for dev in self.disks:
disk = self.disks[dev] disk = self.disks[dev]
msger.debug("Initializing partition table for %s" % \ msger.debug("Initializing partition table for %s" % \
(disk['disk'].device)) (disk['disk'].device))
@@ -354,7 +354,7 @@ class Image(object):
os.rename(source, image_file + '.p%d' % part['num']) os.rename(source, image_file + '.p%d' % part['num'])
def create(self): def create(self):
for dev in self.disks.keys(): for dev in self.disks:
disk = self.disks[dev] disk = self.disks[dev]
disk['disk'].create() disk['disk'].create()