Commit 2fa565fc by devttys0

Fixed bug in module kwarg processing that ignored default kwarg key values.

parent e289cf73
...@@ -45,7 +45,7 @@ class Option(object): ...@@ -45,7 +45,7 @@ class Option(object):
self.type = str self.type = str
self.dtype = str.__name__ self.dtype = str.__name__
def convert(self, value): def convert(self, value, default_value):
if self.type and (self.type.__name__ == self.dtype): if self.type and (self.type.__name__ == self.dtype):
# Be sure to specify a base of 0 for int() so that the base is auto-detected # Be sure to specify a base of 0 for int() so that the base is auto-detected
if self.type == int: if self.type == int:
...@@ -53,7 +53,7 @@ class Option(object): ...@@ -53,7 +53,7 @@ class Option(object):
else: else:
return self.type(value) return self.type(value)
else: else:
return value return default_value
class Kwarg(object): class Kwarg(object):
''' '''
...@@ -753,7 +753,7 @@ class Modules(object): ...@@ -753,7 +753,7 @@ class Modules(object):
last_priority[name] = module_option.priority last_priority[name] = module_option.priority
try: try:
kwargs[name] = module_option.convert(args[module_option.long]) kwargs[name] = module_option.convert(args[module_option.long], default_value)
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
raise e raise e
except Exception as e: except Exception as e:
......
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