Win py3fixes #1931
Merged
Win py3fixes #1931
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
| @@ -155,7 +155,7 @@ def getoutput(cmd): | |||
|
|
|||
| if out is None: | |||
| out = '' | |||
| return out | |||
| return py3compat.bytes_to_str(out) | |||
There was a problem hiding this comment.
The out = '' immediately above should probably be out = b'' to be fully consistent, or put the conversion in an else block.
|
Apart from Min's suggestion, this is fine. Thanks, Jörgen. |
|
Thanks, merging. |
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
A few python3 fixes for Windows
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.
There are currently four test failures on shiningpanda for python3.2 on windows (https://jenkins.shiningpanda.com/ipython/job/ipython-windows-py32/1/)
This PR fixes the last three. The history_manager bug is more involved and I will not have time to look into it until the last week of june.
There are no failures using python2.7