diff -Nur aap-1.072.dist/Error.py aap-1.072/Error.py --- aap-1.072.dist/Error.py 2007-11-21 21:04:54.000000000 -0500 +++ aap-1.072/Error.py 2007-11-21 20:59:14.000000000 -0500 @@ -12,40 +12,30 @@ class NormalExit(Exception): """Normal exit, used for "--version", ":exit", etc.""" - def __init__(self): - Exception.__init__(self) + pass class FinishRecipe(Exception): """Quit the current recipe, used ":finish".""" - def __init__(self): - Exception.__init__(self) + pass class UserError(Exception): """Error for something the user has done wrong. Usually causes us to exit with a non-zero value.""" - def __init__(self, args = None): - Exception.__init__(self) - self.args = args + pass class WriteAfterRead(Exception): """Error for writing a local variable after reading it from another scope. """ - def __init__(self, args = None): - Exception.__init__(self) - self.args = args + pass class InternalError(Exception): """Error for something wrong in our code. Usually causes us to exit with a non-zero value.""" - def __init__(self, args = None): - Exception.__init__(self) - self.args = args + pass class OriginUpdate(Exception): """An ":recipe" command updated the recipe file and throws this exception to cancel executing the old one.""" - def __init__(self, args = None): - Exception.__init__(self) - self.args = args + pass # vim: set sw=4 et sts=4 tw=79 fo+=l: diff -Nur aap-1.072.dist/Main.py aap-1.072/Main.py --- aap-1.072.dist/Main.py 2007-11-21 21:04:54.000000000 -0500 +++ aap-1.072/Main.py 2007-11-21 20:59:14.000000000 -0500 @@ -77,7 +77,7 @@ if Global.cmd_args.has_option("verbose"): Global.cmd_args.printit() - + # When profiling is requested and it wasn't started yet, start all over # with profiling enabled. global profiling @@ -125,7 +125,7 @@ msg = _("Interrupted") except UserError, e: exit_status = 1 - msg = e.args + msg = _("User error") + str(e) except SyntaxError, e: exit_status = 1 exit_info = sys.exc_info()