cleanup exception printing a bit

mayfield · Feb 18, 2023 · d37296a · d37296a
1 parent d55bb45
commit d37296a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/shellish/command/command.py b/shellish/command/command.py
@@ -165,7 +165,7 @@ def run_wrap(self, args):
         except (SystemExit, Exception) as e:
             self.postrun(args, exc=e)
             self.fire_event('postrun', args, exc=e)
-            raise e
+            raise
         else:
             self.postrun(args, result=result)
             self.fire_event('postrun', args, result=result)

diff --git a/shellish/rendering/traceback.py b/shellish/rendering/traceback.py
@@ -24,14 +24,14 @@ def format_exception(exc, indent=0, pad='  '):
         yield '\n%s%s\n' % (padding, from_msg)
     yield '%s<b><u>Traceback (most recent call last)</u></b>' % padding
     tblist = traceback.extract_tb(exc.__traceback__)
-    tbdepth = len(tblist)
+    tbdepth = 1
     for x in tblist:
         depth = '%d.' % tbdepth
         yield '%s<dim>%-3s</dim> <cyan>File</cyan> "<blue>%s</blue>", ' \
             'line <u>%d</u>, in <b>%s</b>' % (padding, depth, x.filename,
                                               x.lineno, x.name)
         yield '%s      %s' % (padding, x.line)
-        tbdepth -= 1
+        tbdepth += 1
     yield '%s<b><red>%s</red>: %s</b>' % (padding, type(exc).__name__, exc)
     return indent + 1
 

diff --git a/shellish/session.py b/shellish/session.py
@@ -112,7 +112,7 @@ def execute(self, command, args):
                 result = command.run_wrap(args)
             except BaseException as e:
                 self.fire_event('postcmd', command, args, exc=e)
-                raise e
+                raise
             else:
                 self.fire_event('postcmd', command, args, result=result)
                 return result