Merge pull request #1230 from astrofrog/remove-custom-qmessagebox

Don't use custom QMessageBox subclass

glue/app/qt/application.py

@@ -29,7 +29,6 @@
 from glue.viewers.scatter.qt import ScatterWidget
 from glue.utils import nonpartial
 from glue.utils.qt import (pick_class, GlueTabBar,
-                           QMessageBoxPatched as QMessageBox,
                            set_cursor_cm, messagebox_on_error, load_ui)
 
 from glue.app.qt.feedback import submit_bug_report, submit_feedback
@@ -308,13 +307,13 @@ def close_tab(self, index):
             return
 
         if not os.environ.get('GLUE_TESTING'):
-            buttons = QMessageBox.Ok | QMessageBox.Cancel
-            dialog = QMessageBox.warning(
+            buttons = QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel
+            dialog = QtWidgets.QMessageBox.warning(
                 self, "Confirm Close",
                 "Are you sure you want to close this tab? "
                 "This will close all data viewers in the tab.",
-                buttons=buttons, defaultButton=QMessageBox.Cancel)
-            if not dialog == QMessageBox.Ok:
+                buttons=buttons, defaultButton=QtWidgets.QMessageBox.Cancel)
+            if not dialog == QtWidgets.QMessageBox.Ok:
                 return
 
         w = self.tab_widget.widget(index)
@@ -746,13 +745,13 @@ def _reset_session(self, show=True):
         """
 
         if not os.environ.get('GLUE_TESTING'):
-            buttons = QMessageBox.Ok | QMessageBox.Cancel
-            dialog = QMessageBox.warning(
+            buttons = QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel
+            dialog = QtWidgets.QMessageBox.warning(
                 self, "Confirm Close",
                 "Are you sure you want to reset the session? "
                 "This will close all datasets, subsets, and data viewers",
-                buttons=buttons, defaultButton=QMessageBox.Cancel)
-            if not dialog == QMessageBox.Ok:
+                buttons=buttons, defaultButton=QtWidgets.QMessageBox.Cancel)
+            if not dialog == QtWidgets.QMessageBox.Ok:
                 return
 
         ga = GlueApplication()
@@ -831,7 +830,7 @@ def _setup_terminal_error_dialog(self, exception):
                "\nReason:\n%s" % exception)
 
         def show_msg():
-            mb = QMessageBox(QMessageBox.Critical,
+            mb = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical,
                              title, msg)
             mb.setDetailedText(self._terminal_exception)
             mb.exec_()
@@ -936,7 +935,7 @@ def report_error(self, message, detail):
         :param detail: A longer description
         :type detail: str
         """
-        qmb = QMessageBox(QMessageBox.Critical, "Error", message)
+        qmb = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, "Error", message)
         qmb.setDetailedText(detail)
         qmb.resize(400, qmb.size().height())
         qmb.exec_()

glue/app/qt/plugin_manager.py

@@ -16,7 +16,7 @@ class QtPluginManager(object):
     def __init__(self, installed=None):
 
         self.ui = load_ui('plugin_manager.ui', None,
-                           directory=os.path.dirname(__file__))
+                          directory=os.path.dirname(__file__))
 
         self.ui.cancel.clicked.connect(self.reject)
         self.ui.confirm.clicked.connect(self.finalize)
@@ -39,7 +39,7 @@ def update_list(self, installed=None):
 
         for plugin in sorted(config.plugins):
             check = QtWidgets.QTreeWidgetItem(self.ui.tree.invisibleRootItem(),
-                                          ["", plugin])
+                                              ["", plugin])
             check.setFlags(check.flags() | Qt.ItemIsUserCheckable)
             if config.plugins[plugin]:
                 check.setCheckState(0, Qt.Checked)
@@ -65,10 +65,9 @@ def finalize(self):
         except Exception:
             import traceback
             detail = str(traceback.format_exc())
-            from glue.utils.qt import QMessageBoxPatched as QMessageBox
-            message = QMessageBox(QMessageBox.Critical,
-                                  "Error",
-                                  "Could not save plugin configuration")
+            message = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical,
+                                            "Error",
+                                            "Could not save plugin configuration")
             message.setDetailedText(detail)
             message.exec_()
             return

glue/app/qt/tests/test_application.py

@@ -74,7 +74,7 @@ def test_choose_save_session_ioerror(self):
             with patch(mock_open) as op:
                 op.side_effect = IOError
                 fd.return_value = '/tmp/junk', '/tmp/junk'
-                with patch('glue.app.qt.application.QMessageBox') as mb:
+                with patch('qtpy.QtWidgets.QMessageBox') as mb:
                     self.app._choose_save_session()
                     assert mb.call_count == 1
 

glue/app/qt/tests/test_plugin_manager.py

@@ -2,9 +2,10 @@
 
 from mock import patch
 
+from qtpy import QtWidgets
+
 from glue import _plugin_helpers as ph
 from glue.main import load_plugins
-from glue.utils.qt import QMessageBoxPatched
 
 from ..plugin_manager import QtPluginManager
 
@@ -68,7 +69,7 @@ def test_permission_fail(tmpdir):
 
     config2 = ph.PluginConfig.load()
 
-    with patch.object(QMessageBoxPatched, 'exec_', return_value=None) as qmb:
+    with patch.object(QtWidgets.QMessageBox, 'exec_', return_value=None) as qmb:
         w = QtPluginManager()
         w.finalize()
 

glue/dialogs/data_wizard/qt/data_wizard_dialog.py

@@ -2,7 +2,7 @@
 
 from qtpy.QtCore import Qt
 from qtpy import QtWidgets
-from glue.utils.qt import QMessageBoxPatched as QMessageBox, set_cursor_cm
+from glue.utils.qt import set_cursor_cm
 
 __all__ = ['data_wizard', 'GlueDataDialog']
 
@@ -16,14 +16,14 @@ def data_wizard():
     """
     def report_error(error, factory, curfile):
         import traceback
-        retry = QMessageBox.Retry
-        cancel = QMessageBox.Cancel
+        retry = QtWidgets.QMessageBox.Retry
+        cancel = QtWidgets.QMessageBox.Cancel
         buttons = retry | cancel
         detail = traceback.format_exc()
         msg = "\n".join(["Could not load %s (wrong load method?)" % curfile,
                          "File load method: %s" % factory.label])
         detail = "\n\n".join(["Error message: %s" % error, detail])
-        mb = QMessageBox(QMessageBox.Critical, "Data Load Error", msg)
+        mb = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, "Data Load Error", msg)
         mb.setDetailedText(detail)
         mb.setDefaultButton(cancel)
         mb.setStandardButtons(buttons)

glue/dialogs/data_wizard/qt/tests/test_data_wizard.py

@@ -90,6 +90,6 @@ def test_data_wizard_error_cancel():
     """Returns empty list of error generated and then canceled"""
     with patch('glue.dialogs.data_wizard.qt.data_wizard_dialog.GlueDataDialog') as mock:
         mock().load_data.side_effect = Exception
-        with patch('glue.dialogs.data_wizard.qt.data_wizard_dialog.QMessageBox') as qmb:
+        with patch('qtpy.QtWidgets.QMessageBox') as qmb:
             qmb().exec_.return_value = 0
-            assert data_wizard() == []
+            assert data_wizard() == []

glue/tests/test_main.py

@@ -15,7 +15,7 @@
 def test_die_on_error_exception():
     """Decorator should spawn a QMessageBox and exit"""
     with pytest.raises(SystemExit):
-        with patch('glue.utils.qt.QMessageBoxPatched') as qmb:
+        with patch('qtpy.QtWidgets.QMessageBox') as qmb:
             @die_on_error('test_msg')
             def test():
                 raise Exception()
@@ -95,7 +95,7 @@ def test_exec_real(tmpdir):
     filename = tmpdir.join('test.py').strpath
     with open(filename, 'w') as f:
         f.write('a = 1')
-    with patch('glue.utils.qt.QMessageBoxPatched') as qmb:
+    with patch('qtpy.QtWidgets.QMessageBox') as qmb:
         with patch('sys.exit') as exit:
             main('glue -x {0}'.format(os.path.abspath(filename)).split())
     assert exit.called_once_with(0)

glue/utils/qt/__init__.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, division, print_function
 
 from .autocomplete_widget import *
-from .qmessagebox_widget import *
 from .dialogs import *
 from .colors import *
 from .decorators import *

glue/utils/qt/decorators.py

@@ -44,7 +44,9 @@ def set_cursor_cm(shape):
 
 def messagebox_on_error(msg):
     """Decorator that catches exceptions and displays an error message"""
-    from glue.utils.qt import QMessageBoxPatched as QMessageBox  # Must be here
+
+    from qtpy import QtWidgets  # Must be here
+    from qtpy.QtCore import Qt
 
     def decorator(func):
         @wraps(func)
@@ -54,9 +56,10 @@ def wrapper(*args, **kwargs):
             except Exception as e:
                 m = "%s\n%s" % (msg, e.args[0])
                 detail = str(traceback.format_exc())
-                qmb = QMessageBox(QMessageBox.Critical, "Error", m)
+                qmb = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, "Error", m)
                 qmb.setDetailedText(detail)
                 qmb.resize(400, qmb.size().height())
+                qmb.setTextInteractionFlags(Qt.TextSelectableByMouse)
                 qmb.exec_()
         return wrapper
 
@@ -65,7 +68,8 @@ def wrapper(*args, **kwargs):
 
 def die_on_error(msg):
     """Decorator that catches errors, displays a popup message, and quits"""
-    from glue.utils.qt import QMessageBoxPatched as QMessageBox
+
+    from qtpy import QtWidgets  # Must be here
 
     def decorator(func):
         def wrapper(*args, **kwargs):
@@ -82,7 +86,7 @@ def wrapper(*args, **kwargs):
                     detail = "Full message:\n\n%s\n\n%s" % (m, detail)
                     m = m[:500] + '...'
 
-                qmb = QMessageBox(QMessageBox.Critical, "Error", m)
+                qmb = QtWidgets.QMessageBox(QtWidgets.QMessageBox.Critical, "Error", m)
                 qmb.setDetailedText(detail)
                 qmb.show()
                 qmb.raise_()