fallback on lsof if otool not found in libedit detection #525
Conversation
This is necessary for Macs without XCode. It also prevents a crash in the unlikely event that neither is found. lsof detection is vulnerable to false positives if other (non-readline) modules are linked against libedit, but this is also unlikely. closes ipythongh-524
|
I don't have a mac to test on, but I did read it fairly carefully, and it looks clean to me. Thanks! |
|
line 48, not compatible with python3, prefer parenthesis : |
| warnings.warn("libedit detection failed: %s"%err) | ||
| break | ||
| else: | ||
| break | ||
|
|
||
| if p.returncode == 0 and re.search(r'/libedit[\.\d+]*\.dylib\s', otool): | ||
| if p is not None and p.returncode == 0 and re.search(r'/libedit[\.\d+]*\.dylib\s', out): |
There was a problem hiding this comment.
end of line : out is not decoded so re.search() fails.
=> could you check this (seems to work here):
if p is not None and p.returncode == 0 and re.search(r'/libedit[.\d+]*.dylib\s', out.decode()):
|
@OliDa: Note that this is the version to run on Python 2. It will get run through 2to3 to make the version for Python 3. |
|
ok, right. |
|
If you could check that this works with Python 2, we'll get it merged in to master here, then I'll transfer the changes across to the Python 3 port. The aim is for the difference between the two to be as small as possible. |
this eases the work of 2to3, which doesn't catch that `out` is bytes. Also use warnings.warn for 'Failed GetOutputFile' message instead of print.
|
@takluyver, it looks like 2to3 doesn't handle the regex str->bytes fix, so I made it a bytes pattern like you have. This still works fine on 2.6. And the print statement should really go through |
|
thanks guys :-) |
|
Okay, I'll go ahead and merge, then. Thanks! |
|
And I've updated ipython-py3k: jupyter/ipython-py3k@340fc1e |
This is necessary for Macs without XCode.
It also prevents a crash in the unlikely event that neither is found.
lsof detection is vulnerable to false positives if other (non-readline)
modules are linked against libedit and have been imported prior to
the first import of rlineimpl, but this is also unlikely.
closes #524