fix early crash on python3 + PyQt5 #589
Merged
Conversation
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
Check for Python 3.0 shouldn't be necessary since PyQt5 is python3-only. Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>
Skip the check at runtime if Python3 isn't found. The Python 2 bytes() - aka str() ctor works fine without encoding.
| @@ -14,7 +14,12 @@ | |||
|
|
|||
| try: | |||
| # pylint: disable=bytes-builtin | |||
| bstr = bytes | |||
| bytes() | |||
There was a problem hiding this comment.
this should work sans the ().... could even do b = bytes
|
Notes aside, i think I'll take this PR as-is and see what I can tweak on my end. Thanks for the fix! |
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
Aug 22, 2016
Arrange for `bstr()` to be defined as a function for Python 3 only. Avoid exception by checking the Python version explicitly. Set `bstr = bytes` for modern Python2 and use `str` for historical Pythons. Related-to: git-cola#589 Signed-off-by: David Aguilar <davvid@gmail.com>
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
Aug 22, 2016
QByteArray on PyQt5 only accepts byte strings. QByteArray on PyQt4 accepts byte strings too, so simplify the logic by encoding to a byte string unconditionally. Related-to: git-cola#589 Signed-off-by: David Aguilar <davvid@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Must pass "bytes" data type to QByteArray in PyQt5.