Merge "fix: Exception message includes unnecessary class args"

This commit is contained in:
Jenkins 2016-03-01 07:03:17 +00:00 committed by Gerrit Code Review
commit 0dfc50ea1c

View File

@ -89,7 +89,7 @@ class MultiKeyValueAction(argparse.Action):
else: else:
msg = ("Expected key=value pairs separated by comma, " msg = ("Expected key=value pairs separated by comma, "
"but got: %s" % (str(kv))) "but got: %s" % (str(kv)))
raise argparse.ArgumentTypeError(self, msg) raise argparse.ArgumentTypeError(msg)
# Check key validation # Check key validation
valid_keys = self.required_keys | self.optional_keys valid_keys = self.required_keys | self.optional_keys
@ -160,4 +160,4 @@ class NonNegativeAction(argparse.Action):
setattr(namespace, self.dest, values) setattr(namespace, self.dest, values)
except Exception: except Exception:
msg = "%s expected a non-negative integer" % (str(option_string)) msg = "%s expected a non-negative integer" % (str(option_string))
raise argparse.ArgumentTypeError(self, msg) raise argparse.ArgumentTypeError(msg)