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

BUG FIX for Pull Request #2275: Fix incorrect function calls #2326

Merged
merged 1 commit into from
Aug 22, 2013

Conversation

pmarshwx
Copy link

In PR #2275, all the individual Qt functions were changed from being imported individually to being referenced from their parent QtCore or QtGui module. Unfortunately, this pull request accidentally kept pyqtSignature and pyqtProperty (which were aliased Qt calls) instead of utilizing the correct underlying Qt calls. This pull request changes the QtCore.pyqtSignature and QtCore.pyqtProperty calls from PR #2275 to the correct QtCore.Slot and QtCore.Property calls.

@ghost ghost assigned mdboom Aug 22, 2013
@dopplershift
Copy link
Contributor

Would be helpful to get feedback from @mspacek if he has anything to add since he made the original PR.

@efiring
Copy link
Member

efiring commented Aug 22, 2013

I can't test this myself since I don't use PySide, but this looks like exactly the right fix.

Fix the incorrectly named Qt.pyqtSignature and Qt.pyqtProperty functions introduced in a previous merge
@tacaswell
Copy link
Member

This is a fix for issue #2318

@pmarshwx
Copy link
Author

@tacaswell, can you confirm that this fix worked for you? I know it does for me...

@pmarshwx
Copy link
Author

I should have added that I tested this with the latest versions of PySide and PyQt4

@mspacek
Copy link
Contributor

mspacek commented Aug 22, 2013

@pmarshwx thanks for that. I've finally got PySide and PyQt4 installed side by side. This fixes the error from PySide on import, but the figure editor still raises an AttributeError for QtCore.QString (line 100), which I think only exists in PyQt4 API 1, and not in API 2 or PySide. I'll see if I can get that fixed. Or if you could have a look, that would be great.

@pmarshwx
Copy link
Author

Admittedly, I did not test my submission against the PyQt v1 API. Thanks for catching that.

@efiring efiring merged commit a1f3814 into matplotlib:master Aug 22, 2013
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