more general fix for #662 #1472
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
Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general `re.sub`.
| @@ -217,16 +217,12 @@ def ipexec(fname, options=None): | |||
| full_cmd = '%s %s %s' % (ipython_cmd, cmdargs, full_fname) | |||
| #print >> sys.stderr, 'FULL CMD:', full_cmd # dbg | |||
| out = getoutputerror(full_cmd) | |||
There was a problem hiding this comment.
I think the code would be tidier if we unpack out, err here, and then repack them at the return statement. That way, out is always a string, rather than swapping between being a tuple and a string.
There was a problem hiding this comment.
Indeed, and I checked getoutputerror, which now guarantees it will return a tuple of strings (apparently it used to return either a tuple of strings or None). That makes this code a good deal simpler.
|
Apart from that minor point, I think this looks OK. I assume that no sequence matching |
Code reflected the possibility that getoutputerror could return None, but this is no longer the case. It always returns two strings.
|
OK, that looks good to me. |
minrk
added a commit
that referenced
this pull request
Mar 13, 2012
more general fix for #662 Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general re.sub.
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
more general fix for ipython#662 Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general re.sub.
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.
Previously, the extra readline output was only stripped from the front, but I have recently seen it (Python 3.2, OSX 10.7) elsewhere, so the replacement is now a general
re.sub.