Commit 893af8f0 authored by Sébastien Luttringer's avatar Sébastien Luttringer
Browse files

Rewrite ISException print_tb code 

Now print traceback recursively with a smart merging of traceback and exception
from sub exception

No more store exception twice in ISException
parent 6e8a0c3a

installsystems/exception.py

+25 −19
Original line number Diff line number Diff line
@@ -23,27 +23,42 @@ 
InstallSystems Exceptions

'''



import StringIO

import sys

import traceback

import installsystems

import sys



class ISException(Exception):

    '''

    Base exception class

    '''



    def __init__(self, message="", exception=None):

        self.message = unicode(message)

        self.exception = exception

        if exception:

            self.exc_info = sys.exc_info()

        self.exception = None if exception is None else sys.exc_info()



    def __str__(self):

        if self.exception:

            return u"%s: %s" % (self.message, self.exception)

        '''

        Return a description of exception

        '''

        if self.exception is not None:

            return u"%s: %s" % (self.message, self.exception[1])

        else:

            return self.message



    def print_sub_tb(self, fd=sys.stderr):

        '''

        Print stored exception traceback and exception message

        '''

        # no exception, do nothing

        if self.exception is None:

            return

        # print traceback and exception separatly to avoid recursive print of

        # "Traceback (most recent call last)" from traceback.print_exception

        traceback.print_tb(self.exception[2], file=fd)

        fd.write("".join(traceback.format_exception_only(self.exception[0], self.exception[1])))

        # recursively call traceback print on ISException error

        if isinstance(self.exception[1], ISException):

            self.exception[1].print_sub_tb()



    def print_tb(self, fd=sys.stderr):

        '''

        Print traceback from embeded exception or current one
@@ -51,19 +66,11 @@ class ISException(Exception): 
        from installsystems.printer import out

        # coloring

        out("#l##B#", fd=fd, endl="")

        # print original exception traceback

        if self.exception is not None:

            traceback.print_exception(self.exc_info[0], self.exc_info[1],

                                      self.exc_info[2], file=fd)

        # print current exception traceback

        else:

            exc_info = sys.exc_info()

            traceback.print_exception(exc_info[0], exc_info[1], exc_info[2],

                                      file=fd)

        traceback.print_exc(file=fd)

        self.print_sub_tb(fd)

        # reset color

        out("#R#", fd=fd, endl="")





class ISError(ISException):

    '''

    Installsystems error; this exception will stop execution
@@ -74,4 +81,3 @@ class ISWarning(ISException): 
    '''

    Installsystems warning; this exception do not stop execution

    '''