From fb6fa1d07f3448ed32e3690237665b206948ba03 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Fri, 8 Sep 2017 12:07:04 +0200 Subject: [PATCH 1/2] Makes restore __init__ works with PySide --- lib/matplotlib/backends/backend_qt5.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py index 1d3c7cd536ae..c57241a4d32c 100644 --- a/lib/matplotlib/backends/backend_qt5.py +++ b/lib/matplotlib/backends/backend_qt5.py @@ -170,11 +170,8 @@ def wrapper(self, **kwargs): QtWidgets.QWidget.__init__ = cooperative_qwidget_init __init__(self, **kwargs) finally: - try: - # Restore __init__ to sip.simplewrapper.__init__. - del QtWidgets.QWidget.__init__ - except AttributeError: - pass + # Restore __init__ + QtWidgets.QWidget.__init__ = qwidget_init return wrapper From 52eb8b8397d26827305fd291d8914ad1b29e8936 Mon Sep 17 00:00:00 2001 From: Thomas VINCENT Date: Fri, 8 Sep 2017 12:09:07 +0200 Subject: [PATCH 2/2] Pass bytes to QApplication() --- lib/matplotlib/backends/backend_qt5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/backends/backend_qt5.py b/lib/matplotlib/backends/backend_qt5.py index c57241a4d32c..2e895195f906 100644 --- a/lib/matplotlib/backends/backend_qt5.py +++ b/lib/matplotlib/backends/backend_qt5.py @@ -121,7 +121,7 @@ def _create_qApp(): if display is None or not re.search(r':\d', display): raise RuntimeError('Invalid DISPLAY variable') - qApp = QtWidgets.QApplication(["matplotlib"]) + qApp = QtWidgets.QApplication([b"matplotlib"]) qApp.lastWindowClosed.connect(qApp.quit) else: qApp = app