Don't call sys.exit() all over the place -- simply return the exit

status from main() and call sys.exit(main()) in the startup stub at
the end of the file.
This commit is contained in:
Guido van Rossum 1997-08-14 19:40:34 +00:00
parent 257c772afa
commit e83870131b

View file

@ -35,7 +35,7 @@ def main():
except getopt.error, msg: except getopt.error, msg:
print msg print msg
print __doc__ print __doc__
sys.exit(2) return 2
verbose = 0 verbose = 0
quiet = 0 quiet = 0
generate = 0 generate = 0
@ -47,7 +47,7 @@ def main():
if o == '-x': exclude = 1 if o == '-x': exclude = 1
if generate and verbose>1: if generate and verbose>1:
print "-g and more than one -v don't go together!" print "-g and more than one -v don't go together!"
sys.exit(2) return 2
good = [] good = []
bad = [] bad = []
skipped = [] skipped = []
@ -79,7 +79,7 @@ def main():
if skipped and not quiet: if skipped and not quiet:
print count(len(skipped), "test"), "skipped:", print count(len(skipped), "test"), "skipped:",
print string.join(skipped) print string.join(skipped)
sys.exit(len(bad) > 0) return len(bad) > 0
stdtests = [ stdtests = [
'test_grammar', 'test_grammar',
@ -184,4 +184,4 @@ class Compare:
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':
main() sys.exit(main())