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.
This code already does from
__future__ import unicode_literal
.Thus '+' will be a unicode string even in python 2 and there is no
need for converting it into a unicode string. In fact this results in
a TypeError because six.u assumes the input string to be ASCII only.
See http://pythonhosted.org/six/#six.u
This fixes test failures with rc3 on python 2
An alternative solution would be to get rid of the use of
from __future__ import unicode_literal
but this seems less intrusive at this late stage.@cgohlke you changed this code the last time to ensure python 3.2 compatibility. Can you please check that you are ok with this change.