From 04de2b0447786d8f3eb644839bffc5599576662c Mon Sep 17 00:00:00 2001
From: crouzet <nicolas.crouzet@cea.fr>
Date: Thu, 17 Jan 2019 10:39:58 +0100
Subject: [PATCH] print stack for everybody, activate debug mode when sat -g
 option is used

---
 sat                |  3 ---
 src/debug.py       | 19 +++++++------------
 src/salomeTools.py | 15 ++-------------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/sat b/sat
index 14b9a86..7355399 100755
--- a/sat
+++ b/sat
@@ -52,9 +52,6 @@ DBG.write("Python version", sys.version, DBG.isDeveloper())
 if __name__ == "__main__":
     from src.salomeTools import Sat # it is time to do import
 
-    _debug = False # Have to be False in production (for programmers DEBUG only)
-    DBG.push_debug(_debug) # as __main__ with sys.exit so no need pop_debug
-
     args = sys.argv[1:] # skip useless "sat'
     sat = Sat(logger) # instantiate the salomeTools class
 
diff --git a/src/debug.py b/src/debug.py
index 5b373ae..1b8cc47 100755
--- a/src/debug.py
+++ b/src/debug.py
@@ -141,18 +141,13 @@ def format_exception(msg, limit=None, trace=None):
   with traceback only if (_debug) or (DBG._user in DBG._developers)
   """
   etype, value, tb = sys.exc_info()
-  if _debug[-1] or isDeveloper():
-    res = msg
-    if tb:
-      res += "\nTraceback (most recent call last):\n"
-      res += "".join(traceback.format_tb(tb, limit))  # [:-1])
-    res += "\n"
-    res += "\n".join(traceback.format_exception_only(etype, value))
-    return res
-  else:
-    res = msg
-    res += "".join(traceback.format_exception_only(etype, value))
-    return res
+  res = msg
+  if tb:
+    res += "\nTraceback (most recent call last):\n"
+    res += "".join(traceback.format_tb(tb, limit))  # [:-1])
+  res += "\n"
+  res += "\n".join(traceback.format_exception_only(etype, value))
+  return res
 
 def format_color_exception(msg, limit=None, trace=None):
   """
diff --git a/src/salomeTools.py b/src/salomeTools.py
index d74ad11..251d6ea 100755
--- a/src/salomeTools.py
+++ b/src/salomeTools.py
@@ -234,6 +234,8 @@ class Sat(object):
     def setInternals(self, opt=None, datadir=None):
         """set the commands by calling the dedicated function etc..."""
         options, remaindersArgs = parser.parse_args(opt)
+        if options.debug_mode:
+            DBG.push_debug(True)
         self.arguments = opt
         self.options = options # the generic options passed to salomeTools
         self.remaindersArgs = remaindersArgs  # the command and their options
@@ -487,19 +489,6 @@ class Sat(object):
 
                     logger_command.write("\n" + DBG.format_exception("") + "\n", 1)
 
-                    """
-                    # have python 3 problems...
-                    # get stack
-                    __, __, exc_traceback = sys.exc_info()
-                    fp = tempfile.TemporaryFile(mode='wt')
-                    traceback.print_tb(exc_traceback, file=fp)
-                    fp.seek(0)
-                    stack = fp.read()
-                    verbosity = 5
-                    if self.options.debug_mode:
-                        verbosity = 1
-                    logger_command.write("TRACEBACK: %s" % stack.replace('"',"'"), verbosity)
-                    """
 
                 finally:
                     # set res if it is not set in the command
-- 
2.30.2