cleaned up: proper exit after -h, -v

1 files changed, 0 insertions, 25 deletions

diff --git a/cmd2.py b/cmd2.py
index 01463b66..05cb611e 100755
--- a/cmd2.py
+++ b/cmd2.py
@@ -21,34 +21,11 @@ flagReader.py options are still supported for backward compatibility
 import cmd, re, os, sys, optparse, subprocess, tempfile

 from optparse import make_option

 

-class Option(optparse.Option):

-    # optparse.Option.take_action keeps trying to use sys.exit.  That's very rude.

-    # We don't want to exit, we just want to know so we can terminate a particular

-    # function call.

-    def take_action(self, action, dest, opt, value, values, parser):

-        if action == "help":

-            parser.print_help()

-            parser.exit()

-            setattr(values, '_exit', True)

-        elif action == "version":

-            parser.print_version()

-            parser.exit()

-            setattr(values, '_exit', True)

-

-        else:

-            return optparse.Option.take_action(self, action, dest, opt, value, values, parser)

-

-        return 1

-    

-#make_option = Option

-

 class OptionParser(optparse.OptionParser):

     def exit(self, status=0, msg=None):

         self.values._exit = True

         if msg:

             print msg

-            # though we must trap and prevent the exit, we also want to end whatever command

-            # was called

 

     def error(self, msg):

         """error(msg : string)

@@ -57,8 +34,6 @@ class OptionParser(optparse.OptionParser):
         If you override this in a subclass, it should not return -- it

         should either exit or raise an exception.

         """

-        #print msg

-        #print self.format_help()

         raise

         

 def options(option_list):