-
Notifications
You must be signed in to change notification settings - Fork 251
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
PyQt enums patch #352
Open
j0yu
wants to merge
5
commits into
mottosso:master
Choose a base branch
from
j0yu:pyqt-enums-patch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
PyQt enums patch #352
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1159,3 +1159,44 @@ def test_multiple_preferred(): | |
assert Qt.__binding__ == "PyQt4", ( | ||
"PyQt4 should have been picked, " | ||
"instead got %s" % Qt.__binding__) | ||
|
||
def test_pyqt_enums(): | ||
"""Check some known enums/flags mappings.""" | ||
from Qt import QtCore | ||
|
||
class_attributes = { # Version agnostic flags and enums | ||
"CheckState": ["Checked", "Unchecked", "PartiallyChecked"], | ||
"Orientation": ["Horizontal", "Vertical"], | ||
} | ||
for class_name, attributes in class_attributes.items(): | ||
qt_class = getattr(QtCore.Qt, class_name) | ||
|
||
values_path = "QtCore.Qt.{0}.{1}".format(class_name, "values") | ||
assert hasattr(qt_class, "values"), ( | ||
"{0} should exist, but is missing".format(values_path)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is very hard to read There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I switched to |
||
|
||
cls_values = getattr(qt_class, "values", None) | ||
assert cls_values and isinstance(cls_values, dict), ( | ||
"{0} should be a non-empty dictionary, " | ||
"not {1}".format(values_path, cls_values)) | ||
|
||
for attr_name in attributes: | ||
attr_path = "QtCore.Qt.{0}.{1}".format(class_name, attr_name) | ||
|
||
assert hasattr(qt_class, attr_name), ( | ||
"{0} should exist, but is missing".format(attr_path)) | ||
|
||
value = getattr(qt_class, attr_name, None) | ||
assert value is not None, ( | ||
"{0} shouldn't be None".format(attr_path)) | ||
|
||
assert attr_name in cls_values, ( | ||
"{0} key should exist in {1} " | ||
"dict".format(attr_name, values_path)) | ||
|
||
cls_value = cls_values[attr_name] | ||
assert value == cls_values[attr_name], ( | ||
"({0}) {1!r} != {2!r} ({3}[{4}])".format( | ||
attr_path, value, cls_value, values_path, attr_name | ||
) | ||
) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one for example could (and likely is) pick up enums other than the 2 being fixed by this PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, it was the original intention to be able to capture all cases found, not just
CheckState
only. The description in the PR could probably do with a better wording to highlight it.