Replace use of str() with six.text_type() for Py2&3 compatibility [backport to color_overhaul] #4278
Conversation
This file contains hidden or 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
Version 1 of the PyQt APIs return QVariant types that must be cast to Python strings before use. To catch this `get_window_title()` in `backend_qt5.py` wrapped the call to `self.window.windowTitle()` with `str()`. This fails on Python 2 if the window title contains unicode characters. This is replaced with `six.text_type` for Py2&3 compatibility with unicode types. A number of other locations in the same file were also using `str()` for potentially unicode data. These are also fixed in this commit. Fixes #4275.
|
Line 140 |
|
👍 |
|
This should be back-ported to color_overhaul which is turning into a bugfix branch |
tacaswell
added a commit
that referenced
this pull request
Mar 26, 2015
MNT : Replace use of str() with six.text_type() for Py2&3 compatibility
tacaswell
added a commit
that referenced
this pull request
Mar 26, 2015
MNT : Replace use of str() with six.text_type() for Py2&3 compatibility
|
backported as 016f568 |
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.
Version 1 of the PyQt APIs return QVariant types that must be
cast to Python strings before use. To catch this
get_window_title()in
backend_qt5.pywrapped the call toself.window.windowTitle()with
str(). This fails on Python 2 if the window title containsunicode characters.
This is replaced with
six.text_typefor Py2&3 compatibility withunicode types.
A number of other locations in the same file were also using
str()for potentially unicode data. These are also fixed in this commit.
Fixes #4275.