From 3f4fd6ec0369b3285cc5f4f8f095c2d4b760fe85 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 1 Sep 2016 14:48:51 +0530
Subject: changed format of tracebacks

---
 yaksh/code_evaluator.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'yaksh/code_evaluator.py')

diff --git a/yaksh/code_evaluator.py b/yaksh/code_evaluator.py
index 2fb429f..d0cac62 100644
--- a/yaksh/code_evaluator.py
+++ b/yaksh/code_evaluator.py
@@ -108,9 +108,14 @@ class CodeEvaluator(object):
 
         except TimeoutException:
             err = self.timeout_msg
+        except OSError:
+            msg = traceback.format_exc(limit=0)
+            err = "Error: {0}".format(msg)
         except Exception:
-            err = "Error: {0}".format(traceback.format_exc(limit=0))
-
+            exc_type, exc_value, exc_tb = sys.exc_info()
+            tb_list = traceback.format_exception(exc_type, exc_value, exc_tb)
+            del tb_list[1:3]
+            err = "Error: {0}".format("".join(tb_list))
         finally:
             # Set back any original signal handler.
             set_original_signal_handler(prev_handler)
-- 
cgit 


From 06daf67b7a579c113d17eacd4bfb0651ab169be4 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 8 Sep 2016 18:18:57 +0530
Subject: added condition to check traceback

---
 yaksh/code_evaluator.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'yaksh/code_evaluator.py')

diff --git a/yaksh/code_evaluator.py b/yaksh/code_evaluator.py
index d0cac62..e139b55 100644
--- a/yaksh/code_evaluator.py
+++ b/yaksh/code_evaluator.py
@@ -114,7 +114,10 @@ class CodeEvaluator(object):
         except Exception:
             exc_type, exc_value, exc_tb = sys.exc_info()
             tb_list = traceback.format_exception(exc_type, exc_value, exc_tb)
-            del tb_list[1:3]
+            if len(tb_list) > 2:
+                del tb_list[1:3]
+            else:
+                pass
             err = "Error: {0}".format("".join(tb_list))
         finally:
             # Set back any original signal handler.
-- 
cgit