Merge pull request #9 from GreatFruitOmsk/master

Under certain conditions exc_traceback can be empty or even None.

Author: fundead

python2/raygun4py/raygunmsgs.py

@@ -89,14 +89,19 @@ class RaygunErrorMessage:
     def __init__(self, exc_type, exc_value, exc_traceback, className):
         self.message = "%s: %s" % (exc_type.__name__, exc_value)
         self.stackTrace = []
-
-        for trace in traceback.extract_tb(exc_traceback):
-              self.stackTrace.append({
-                    "lineNumber": trace[1],
-                    "className": trace[2],
-                    "fileName": trace[0],
-                    "methodName": trace[3],
+        traces = traceback.extract_tb(exc_traceback)
+
+        if traces:
+            for t in traces:
+                self.stackTrace.append({
+                    "lineNumber": t[1],
+                    "className": t[2],
+                    "fileName": t[0],
+                    "methodName": t[3],
                 })
 
-        self.className = trace[2]
+            self.className = traces[-1][2] or className
+        else:
+            self.className = className
+
         self.data = ""

python2/tests/test_raygunmsgs.py

@@ -40,8 +40,13 @@ def test_user(self):
         self.assertEqual(self.builder.raygunMessage.details['user'], { 'identifier': 'user1' })
 
 
+class TestRaygunErrorMessage(unittest.TestCase):
+    def test_exc_traceback_is_none(self):
+        raygunmsgs.RaygunErrorMessage(int, 1, None)
+
+
 def main():
     unittest.main()
 
 if __name__ == '__main__':
-    main()
+    main()

python3/raygun4py/raygunmsgs.py

@@ -89,14 +89,19 @@ class RaygunErrorMessage:
     def __init__(self, exc_type, exc_value, exc_traceback, className):
         self.message = "%s: %s" % (exc_type.__name__, exc_value)
         self.stackTrace = []
-
-        for trace in traceback.extract_tb(exc_traceback):
-              self.stackTrace.append({
-                    "lineNumber": trace[1],
-                    "className": trace[2],
-                    "fileName": trace[0],
-                    "methodName": trace[3],
+        traces = traceback.extract_tb(exc_traceback)
+
+        if traces:
+            for t in traces:
+                self.stackTrace.append({
+                    "lineNumber": t[1],
+                    "className": t[2],
+                    "fileName": t[0],
+                    "methodName": t[3],
                 })
 
-        self.className = trace[2]
+            self.className = traces[-1][2] or className
+        else:
+            self.className = className
+
         self.data = ""

python3/tests/test_raygunmsgs.py

@@ -40,8 +40,13 @@ def test_user(self):
         self.assertEqual(self.builder.raygunMessage.details['user'], { 'identifier': 'user1' })
 
 
+class TestRaygunErrorMessage(unittest.TestCase):
+    def test_exc_traceback_is_none(self):
+        raygunmsgs.RaygunErrorMessage(int, 1, None)
+
+
 def main():
     unittest.main()
 
 if __name__ == '__main__':
-    main()
+    main()