mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
wic: use items instead of iteritems
Dictionary method 'iteritems' doesn't exist in Python 3. Replaced 'iteritems' with 'items' to be able to run the code under both Python 3 and Python 2. [YOCTO #9412] (From OE-Core rev: 5b14eb8d68aaca82de4f8f6bcb28ad6f4a5125d0) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
0c57dd96c8
commit
e36d04abb7
@@ -70,7 +70,7 @@ class ConfigMgr(object):
|
|||||||
self.create = {}
|
self.create = {}
|
||||||
|
|
||||||
# initialize the values with defaults
|
# initialize the values with defaults
|
||||||
for sec, vals in self.DEFAULTS.iteritems():
|
for sec, vals in self.DEFAULTS.items():
|
||||||
setattr(self, sec, vals)
|
setattr(self, sec, vals)
|
||||||
|
|
||||||
def __set_ksconf(self, ksconf):
|
def __set_ksconf(self, ksconf):
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class Creator(object):
|
|||||||
|
|
||||||
# get cmds from pluginmgr
|
# get cmds from pluginmgr
|
||||||
# mix-in do_subcmd interface
|
# mix-in do_subcmd interface
|
||||||
for subcmd, klass in pluginmgr.get_plugins('imager').iteritems():
|
for subcmd, klass in pluginmgr.get_plugins('imager').items():
|
||||||
if not hasattr(klass, 'do_create'):
|
if not hasattr(klass, 'do_create'):
|
||||||
msger.warning("Unsupported subcmd: %s" % subcmd)
|
msger.warning("Unsupported subcmd: %s" % subcmd)
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ def get_wic_plugins_help():
|
|||||||
result = wic_plugins_help
|
result = wic_plugins_help
|
||||||
for plugin_type in PLUGIN_TYPES:
|
for plugin_type in PLUGIN_TYPES:
|
||||||
result += '\n\n%s PLUGINS\n\n' % plugin_type.upper()
|
result += '\n\n%s PLUGINS\n\n' % plugin_type.upper()
|
||||||
for name, plugin in pluginmgr.get_plugins(plugin_type).iteritems():
|
for name, plugin in pluginmgr.get_plugins(plugin_type).items():
|
||||||
result += "\n %s plugin:\n" % name
|
result += "\n %s plugin:\n" % name
|
||||||
if plugin.__doc__:
|
if plugin.__doc__:
|
||||||
result += plugin.__doc__
|
result += plugin.__doc__
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class PluginMgr(object):
|
|||||||
# the value True/False means "loaded"
|
# the value True/False means "loaded"
|
||||||
|
|
||||||
def _load_all(self):
|
def _load_all(self):
|
||||||
for (pdir, loaded) in self.plugin_dirs.iteritems():
|
for (pdir, loaded) in self.plugin_dirs.items():
|
||||||
if loaded:
|
if loaded:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -135,7 +135,7 @@ class PluginMgr(object):
|
|||||||
None is returned.
|
None is returned.
|
||||||
"""
|
"""
|
||||||
return_methods = None
|
return_methods = None
|
||||||
for _source_name, klass in self.get_plugins('source').iteritems():
|
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.keys():
|
||||||
if not hasattr(klass, _method_name):
|
if not hasattr(klass, _method_name):
|
||||||
|
|||||||
Reference in New Issue
Block a user