Commit fdf29459 by devttys0

Fixed API bug in processing of module kwargs

parent 0726deb5
...@@ -537,10 +537,9 @@ class Modules(object): ...@@ -537,10 +537,9 @@ class Modules(object):
def _set_arguments(self, argv=[], kargv={}): def _set_arguments(self, argv=[], kargv={}):
for (k,v) in iterator(kargv): for (k,v) in iterator(kargv):
k = self._parse_api_opt(k) k = self._parse_api_opt(k)
argv.append(k)
if v not in [True, False, None]: if v not in [True, False, None]:
argv.append("%s %s" % (k, v)) argv.append(v)
else:
argv.append(k)
if not argv and not self.arguments: if not argv and not self.arguments:
self.arguments = sys.argv[1:] self.arguments = sys.argv[1:]
......
...@@ -177,7 +177,7 @@ class Plugins(object): ...@@ -177,7 +177,7 @@ class Plugins(object):
if file_name.endswith(self.MODULE_EXTENSION): if file_name.endswith(self.MODULE_EXTENSION):
module = file_name[:-len(self.MODULE_EXTENSION)] module = file_name[:-len(self.MODULE_EXTENSION)]
try: try:
plugin = imp.load_source(module, os.path.join(plugins[key]['path'], file_name)) plugin = imp.load_source(module, os.path.join(plugins[key]['path'], file_name))
plugin_class = self._find_plugin_class(plugin) plugin_class = self._find_plugin_class(plugin)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment