Skip to content
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.

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

Fix PySide compatibility #2328

Merged
merged 2 commits into from
Aug 22, 2013
Merged

Fix PySide compatibility #2328

merged 2 commits into from
Aug 22, 2013

Conversation

mspacek
Copy link
Contributor

@mspacek mspacek commented Aug 22, 2013

This uses PR #2326 from @pmarshwx, plus a fix for an AttributeError for QtCore.QString in PySide when opening the qt editor. This fixes issue #2318.

This works for me in PyQt4 API 1 and PySide, both on Python 2.7.3 in Linux. I've tested about as much of the functionality of the qt editor as I can think of, in both libraries, and I can't get it to break.

Patrick Marsh and others added 2 commits August 21, 2013 22:45
Fix the incorrectly named Qt.pyqtSignature and Qt.pyqtProperty functions introduced in a previous merge
@pmarshwx
Copy link

My simple testing shows this works. However, I did not put it through a lot of rigorous testing.

@tacaswell
Copy link
Member

My simple testing also shows this works for both PySide and PyQt4. Two simple testings == one rigorous testing right?

Joking aside, the issues are either not being able to import mpl at all or a dialog not opening, both of which pass here. I would argue any other issues should be a new issue anyway.

If I have any say, this should be merged.

efiring added a commit that referenced this pull request Aug 22, 2013
Fix PySide compatibility
@efiring efiring merged commit 8bba2a4 into matplotlib:master Aug 22, 2013
@pmarshwx
Copy link

OK...

This fix (for PyQt4 v1 API) appears to break the ability to add/change the default text in the PySide PyQt4 v2 API. The image fails when the default text (labels) are changed, or additional text boxes are added. I haven't confirmed that it is this particular PR that causes it, but it's my strong suspicion. I'm working right now to track it down, but wanted to at least make a note that there are still problems.

@pmarshwx
Copy link

More on my last comment...it appears that issue I described only happens with LaTeX strings, and is not related to this PR. I'll continue to dig around and then file a separate issue and/or pull request.

efiring added a commit that referenced this pull request Aug 26, 2013
Fix PySide compatibility
Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py
@mdboom
Copy link
Member

mdboom commented Aug 26, 2013

Backported to 1.3.x as c774379

@dmcdougall
Copy link
Member

@mdboom That commit appears to contain conflict markers.

@mdboom
Copy link
Member

mdboom commented Aug 26, 2013

@dmcdougall: Thanks. I noticed that myself a few hours ago. I have since fixed it on 1.3.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants