diff options
Diffstat (limited to 'scripts/lib')
| -rw-r--r-- | scripts/lib/wic/conf.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/creator.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/help.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugin.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/scripts/lib/wic/conf.py b/scripts/lib/wic/conf.py index f7d56d046b..070ec3096b 100644 --- a/scripts/lib/wic/conf.py +++ b/scripts/lib/wic/conf.py | |||
| @@ -70,7 +70,7 @@ class ConfigMgr(object): | |||
| 70 | self.create = {} | 70 | self.create = {} |
| 71 | 71 | ||
| 72 | # initialize the values with defaults | 72 | # initialize the values with defaults |
| 73 | for sec, vals in self.DEFAULTS.iteritems(): | 73 | for sec, vals in self.DEFAULTS.items(): |
| 74 | setattr(self, sec, vals) | 74 | setattr(self, sec, vals) |
| 75 | 75 | ||
| 76 | def __set_ksconf(self, ksconf): | 76 | def __set_ksconf(self, ksconf): |
diff --git a/scripts/lib/wic/creator.py b/scripts/lib/wic/creator.py index 5231297282..d0158fb62f 100644 --- a/scripts/lib/wic/creator.py +++ b/scripts/lib/wic/creator.py | |||
| @@ -41,7 +41,7 @@ class Creator(object): | |||
| 41 | 41 | ||
| 42 | # get cmds from pluginmgr | 42 | # get cmds from pluginmgr |
| 43 | # mix-in do_subcmd interface | 43 | # mix-in do_subcmd interface |
| 44 | for subcmd, klass in pluginmgr.get_plugins('imager').iteritems(): | 44 | for subcmd, klass in pluginmgr.get_plugins('imager').items(): |
| 45 | if not hasattr(klass, 'do_create'): | 45 | if not hasattr(klass, 'do_create'): |
| 46 | msger.warning("Unsupported subcmd: %s" % subcmd) | 46 | msger.warning("Unsupported subcmd: %s" % subcmd) |
| 47 | continue | 47 | continue |
diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py index 158b6c1ae0..7dcc71740b 100644 --- a/scripts/lib/wic/help.py +++ b/scripts/lib/wic/help.py | |||
| @@ -66,7 +66,7 @@ def get_wic_plugins_help(): | |||
| 66 | result = wic_plugins_help | 66 | result = wic_plugins_help |
| 67 | for plugin_type in PLUGIN_TYPES: | 67 | for plugin_type in PLUGIN_TYPES: |
| 68 | result += '\n\n%s PLUGINS\n\n' % plugin_type.upper() | 68 | result += '\n\n%s PLUGINS\n\n' % plugin_type.upper() |
| 69 | for name, plugin in pluginmgr.get_plugins(plugin_type).iteritems(): | 69 | for name, plugin in pluginmgr.get_plugins(plugin_type).items(): |
| 70 | result += "\n %s plugin:\n" % name | 70 | result += "\n %s plugin:\n" % name |
| 71 | if plugin.__doc__: | 71 | if plugin.__doc__: |
| 72 | result += plugin.__doc__ | 72 | result += plugin.__doc__ |
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index ccfdfcb934..80c609cf8c 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py | |||
| @@ -81,7 +81,7 @@ class PluginMgr(object): | |||
| 81 | # the value True/False means "loaded" | 81 | # the value True/False means "loaded" |
| 82 | 82 | ||
| 83 | def _load_all(self): | 83 | def _load_all(self): |
| 84 | for (pdir, loaded) in self.plugin_dirs.iteritems(): | 84 | for (pdir, loaded) in self.plugin_dirs.items(): |
| 85 | if loaded: | 85 | if loaded: |
| 86 | continue | 86 | continue |
| 87 | 87 | ||
| @@ -135,7 +135,7 @@ class PluginMgr(object): | |||
| 135 | None is returned. | 135 | None is returned. |
| 136 | """ | 136 | """ |
| 137 | return_methods = None | 137 | return_methods = None |
| 138 | for _source_name, klass in self.get_plugins('source').iteritems(): | 138 | for _source_name, klass in self.get_plugins('source').items(): |
| 139 | if _source_name == source_name: | 139 | if _source_name == source_name: |
| 140 | for _method_name in methods.keys(): | 140 | for _method_name in methods.keys(): |
| 141 | if not hasattr(klass, _method_name): | 141 | if not hasattr(klass, _method_name): |
