Merge remote-tracking branch 'upstream/dev' into dev

Author: un4gt

pydumpling/fake_types.py

@@ -66,7 +66,7 @@ def __init__(self, traceback=None):
         self.tb_lineno = traceback.tb_lineno if traceback else None
         self.tb_next = FakeTraceback(
             traceback.tb_next) if traceback and traceback.tb_next else None
-        self.tb_lasti = 0
+        self.tb_lasti = traceback.tb_lasti if traceback else 0
 
 
 class FakeFrame(FakeType):
@@ -78,6 +78,8 @@ def __init__(self, frame):
         self.f_globals = self._convert_dict(frame.f_globals)
         self.f_lineno = frame.f_lineno
         self.f_back = FakeFrame(frame.f_back) if frame.f_back else None
+        self.f_lasti = frame.f_lasti
+        self.f_builtins = frame.f_builtins
 
 
 class FakeClass(FakeType):
@@ -107,6 +109,8 @@ def __init__(self, code):
             code, "co_lines") else []
         if hasattr(code, "co_kwonlyargcount"):
             self.co_kwonlyargcount = code.co_kwonlyargcount
+        if hasattr(code, "co_positions"):
+            self.co_positions = code.co_positions
 
     def co_lines(self):
         return iter(self._co_lines)

pydumpling/pydumpling.py

@@ -14,16 +14,20 @@
 def save_dumping(filename=None, tb=None):
     try:
         if tb is None:
-            tb = sys.exc_info()[2]
+            exc_type, exc_value, exc_tb = sys.exc_info()
 
         if filename is None:
             filename = "%s:%d.dump" % (
-                tb.tb_frame.f_code.co_filename, tb.tb_frame.f_lineno)
+                exc_tb.tb_frame.f_code.co_filename, exc_tb.tb_frame.f_lineno)
 
-        fake_tb = FakeTraceback(tb)
+        fake_tb = FakeTraceback(exc_tb)
         dumpling = {
             "traceback": fake_tb,
             "version": __version__,
+            "exc_extra": {
+                "exc_type": exc_type,
+                "exc_value": exc_value,
+            },
             "dump_type": "DILL"
         }
         with gzip.open(filename, "wb") as f: