Changeset 08bf1a42b169043a053781d2d139c0022fc65330

Timestamp:

09/21/11 22:29:31 (8 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

5a26cd79d820f0f17613b4556127836ff6cb0c2d

Parents:

769c378f66d18dc35bcdc76339da83552f6404a4

git-committer:

Luper Rouch <luper.rouch@…> (09/21/11 22:29:31)

Message:

tracebacks from other threads are now handled correcly by the bug report dialog

Location:

pyflu/pyflu

Files:

• __init__.py (modified) (1 diff)
• qt/bug_report/__init__.py (modified) (3 diffs)
• qt/bug_report/dialog.py (modified) (1 diff)

pyflu/pyflu/__init__.py

@@ -5 +5 @@
 
 def version():
-    return "0.9.1"
+    return "0.9.2"
 

pyflu/pyflu/qt/bug_report/__init__.py

@@ -1 +1 @@
 import sys
+import thread
+from PyQt4.QtCore import QObject, pyqtSignal, Qt
 from pyflu.qt.bug_report.dialog import BugReportDialog
 from pyflu.qt.bug_report.tb import install_ext_editor_url_handler
@@ -6 +8 @@
 
 bug_report_dlg = None
+tb_sender = None
+
+
+class TracebackSender(QObject):
+    """
+    An intermediary to send tracebacks from other threads.
+    """
+
+    traceback_sent = pyqtSignal(object, object, object, object)
 
 
 def excepthook(type, value, tb):
-    bug_report_dlg.show()
-    bug_report_dlg.add_tb(type, value, tb)
+    thread_id = thread.get_ident()
+    tb_sender.traceback_sent.emit(thread_id, type, value, tb)
 
 
@@ -21 +32 @@
     errors (for example just after the QApplication has been created).
     """
-    global bug_report_dlg
+    global bug_report_dlg, tb_sender
     settings.BUG_REPORT_EMAIL = bug_report_email
     bug_report_dlg = BugReportDialog(parent)
+    tb_sender = TracebackSender()
+    tb_sender.traceback_sent.connect(bug_report_dlg.add_tb, 
+            Qt.QueuedConnection)
     sys.excepthook = excepthook
     install_ext_editor_url_handler()

pyflu/pyflu/qt/bug_report/dialog.py

@@ -35 +35 @@
         self.traceback_text.clear()
 
-    def add_tb(self, type, value, tb):
-        thread_id = thread.get_ident()
+    def add_tb(self, thread_id, type, value, tb):
+        if not self.isVisible():
+            self.show()
         if thread_id == self.main_thread_id and self.main_traceback is None:
             self.main_traceback = (type, value, tb)