clarify error typeout

svn: r18401
This commit is contained in:
Paul Franklin 2011-11-04 16:04:51 +00:00
parent 54b8b1d616
commit e1f7943f1e

View File

@ -88,14 +88,14 @@ def _convert_str_to_match_type(str_val, type_val):
if str_val.isdigit(): if str_val.isdigit():
return int(str_val) return int(str_val)
else: else:
print "%s is not an integer number" % str_val print "'%s' is not an integer number" % str_val
return 0 return 0
elif ret_type == float: elif ret_type == float:
try: try:
return float(str_val) return float(str_val)
except ValueError: except ValueError:
print "%s is not a decimal number" % str_val print "'%s' is not a decimal number" % str_val
return 0.0 return 0.0
elif ret_type == bool: elif ret_type == bool:
@ -104,13 +104,13 @@ def _convert_str_to_match_type(str_val, type_val):
elif str_val == str(False): elif str_val == str(False):
return False return False
else: else:
print "%s is not a boolean-- try 'True' or 'False'" % str_val print "'%s' is not a boolean-- try 'True' or 'False'" % str_val
return False return False
elif ret_type == list: elif ret_type == list:
ret_val = [] ret_val = []
if not ( str_val.startswith("[") and str_val.endswith("]") ): if not ( str_val.startswith("[") and str_val.endswith("]") ):
print "%s is not a list-- try: [%s]" % (str_val, str_val) print "'%s' is not a list-- try: [%s]" % (str_val, str_val)
return ret_val return ret_val
entry = "" entry = ""
@ -526,7 +526,7 @@ class CommandLineReport(object):
else: else:
#there was a show option given, but the option is invalid #there was a show option given, but the option is invalid
print ("option %s not valid. Use 'show=all' to see all valid " print ("option '%s' not valid. Use 'show=all' to see all valid "
"options." % self.show) "options." % self.show)
#------------------------------------------------------------------------ #------------------------------------------------------------------------