Skip to content

Fix matplotlib corrupting PySide #9169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tacaswell merged 2 commits into from
Sep 18, 2017
Merged

Fix matplotlib corrupting PySide #9169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb6fa1d
Makes restore __init__ works with PySide
t20100 Sep 8, 2017
52eb8b8
Pass bytes to QApplication()
t20100 Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions lib/matplotlib/backends/backend_qt5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down