Progresss

Author: hwikle-lanl

lib/pavilion/errors.py

@@ -7,10 +7,15 @@
 import shutil
 import traceback
 
+from traceback import format_exception
+from typing import List
+
 import lark
 
 import yc_yaml
 
+from pavilion.micro import flatten
+
 
 class PavilionError(RuntimeError):
     """Base class for all Pavilion errors."""
@@ -47,12 +52,31 @@ def __str__(self):
         else:
             return self.msg
 
-    def pformat(self) -> str:
-        """Specially format the exception for printing."""
+    @staticmethod
+    def _wrap_lines(lines: List[str], width: int) -> List[str]:
+        """Given a list of lines, produce a new list of lines wrapped to the specified width."""
+
+        lines = map(lambda x: textwrap.wrap(x, width=width), lines) 
+
+        return list(flatten(lines))
+
+
+    def pformat(self, traceback: bool = False) -> str:
+        """Specially format the exception for printing. If traceback is True, return the full
+        traceback associated with the error. Otherwise, return a summary of the error."""
+
+        width = shutil.get_terminal_size((80, 80)).columns
+
+        if traceback:
+            lines = self._wrap_lines(format_exception(self))
+
+            # Remove newlines, for consistency with textwrap.wrap
+            map(lambda x: x.rstrip("\n"), lines)
+
+            return "\n".join(lines)
 
         lines = []
         next_exc = self.prior_error
-        width = shutil.get_terminal_size((80, 80)).columns
         tab_level = 0
         for line in str(self.msg).split('\n'):
             lines.extend(textwrap.wrap(line, width=width))

lib/pavilion/main.py

@@ -54,7 +54,7 @@ def main():
         if not '--show-tracebacks' in sys.argv:
             output.fprint(sys.stderr, "Error getting config, exiting.", err, color=output.RED)
         else:
-            print(traceback.format_exc())
+            PavilionError(err).pformat(traceback=True)
 
         sys.exit(-1)
 
@@ -68,7 +68,7 @@ def main():
         if not partial_args.show_tracebacks:
             output.fprint(sys.stderr, "Error initializing plugins.", err, color=output.RED)
         else:
-            print(traceback.format_exc())
+            PavilionError(err).pformat(traceback=True)
 
         sys.exit(-1)