New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
add dirty trick for readline import on OSX #937
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,18 @@ | |
|
||
from subprocess import Popen, PIPE | ||
|
||
if sys.platform == 'darwin': | ||
# dirty trick, to skip the system readline, because pip-installed readline | ||
# will never be found on OSX, since lib-dynload always comes ahead of site-packages | ||
from distutils import sysconfig | ||
lib_dynload = sysconfig.get_config_var('DESTSHARED') | ||
del sysconfig | ||
try: | ||
dynload_idx = sys.path.index(lib_dynload) | ||
except ValueError: | ||
dynload_idx = -1 | ||
else: | ||
sys.path.pop(dynload_idx) | ||
try: | ||
from readline import * | ||
import readline as _rl | ||
|
@@ -29,6 +41,26 @@ | |
except ImportError: | ||
have_readline = False | ||
|
||
if sys.platform == 'darwin': | ||
# dirty trick, part II: | ||
if dynload_idx != -1: | ||
# restore path | ||
sys.path.insert(dynload_idx, lib_dynload) | ||
if not have_readline: | ||
# *only* have system readline, try import again | ||
try: | ||
from readline import * | ||
import readline as _rl | ||
have_readline = True | ||
except ImportError: | ||
have_readline = False | ||
else: | ||
# if we want to warn about EPD / Fink having bad readline | ||
# we would do it here | ||
pass | ||
# cleanup dirty trick vars | ||
del dynload_idx, lib_dynload | ||
|
||
if have_readline and hasattr(_rl, 'rlmain'): | ||
# patch add_history to allow for strings in pyreadline <= 1.5: | ||
# fix copied from pyreadline 1.6 | ||
|
@@ -51,52 +83,30 @@ def add_history(line): | |
# Test to see if libedit is being used instead of GNU readline. | ||
# Thanks to Boyd Waters for the original patch. | ||
uses_libedit = False | ||
if sys.platform == 'darwin' and have_readline: | ||
# Previously this used commands.getstatusoutput, which uses os.popen. | ||
# Switching to subprocess.Popen, and exponential falloff for EINTR | ||
# seems to make this better behaved in environments such as PyQt and gdb | ||
dt = 1e-3 | ||
while dt < 1: | ||
try: | ||
p = Popen(['otool', '-L', _rl.__file__], stdout=PIPE, stderr=PIPE) | ||
except OSError: | ||
try: | ||
# otool not available (no XCode), use lsof instead. | ||
# This *could* have a false positive | ||
# if another package that uses libedit explicitly | ||
# has been imported prior to this test. | ||
p = Popen(['lsof', '-p', str(os.getpid())], stdout=PIPE, stderr=PIPE) | ||
except OSError: | ||
# This is highly unlikely, but let's be sure | ||
# we don't crash IPython just because we can't find lsof | ||
p = out = err = None | ||
warnings.warn("libedit detection failed") | ||
break | ||
|
||
out,err = p.communicate() | ||
|
||
if p.returncode == 4: | ||
# EINTR | ||
time.sleep(dt) | ||
dt *= 2 | ||
continue | ||
elif p is None or p.returncode: | ||
warnings.warn("libedit detection failed: %s"%err) | ||
break | ||
else: | ||
break | ||
|
||
if p is not None and p.returncode == 0 and re.search(br'/libedit[\.\d+]*\.dylib\s', out): | ||
# we are bound to libedit - new in Leopard | ||
_rl.parse_and_bind("bind ^I rl_complete") | ||
warnings.warn("Leopard libedit detected - readline will not be well behaved " | ||
"including some crashes on tab completion, and incorrect history navigation. " | ||
"It is highly recommended that you install readline, " | ||
"which is easy_installable with: 'easy_install readline'", | ||
RuntimeWarning) | ||
uses_libedit = True | ||
# cleanup names | ||
del dt,p,out,err | ||
if have_readline: | ||
# Official Python docs state that 'libedit' is in the docstring for libedit readline: | ||
uses_libedit = 'libedit' in _rl.__doc__ | ||
# Note that many non-System Pythons also do not use proper readline, | ||
# but do not report libedit at all, nor are they linked dynamically against libedit. | ||
# known culprits of this include: EPD, Fink | ||
# There is not much we can do to detect this, until we find a specific failure | ||
# case, rather than relying on the readline module to self-identify as broken. | ||
if uses_libedit and sys.platform == 'darwin': | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'd add a line of whitespace above 94 to separate these two big |
||
_rl.parse_and_bind("bind ^I rl_complete") | ||
warnings.warn('\n'.join(['', "*"*78, | ||
"libedit detected - readline will not be well behaved, including but not limited to:", | ||
" * crashes on tab completion", | ||
" * incorrect history navigation", | ||
" * corrupting long-lines", | ||
" * failure to wrap or indent lines properly", | ||
"It is highly recommended that you install readline, which is easy_installable:", | ||
" easy_install readline", | ||
"Note that `pip install readline` generally DOES NOT WORK, because", | ||
"it installs to site-packages, which come *after* lib-dynload in sys.path,", | ||
"where readline is located. It must be `easy_install readline`, or to a custom", | ||
"location on your PYTHONPATH (even --user comes after lib-dyload).", | ||
"*"*78]), | ||
RuntimeWarning) | ||
|
||
# the clear_history() function was only introduced in Python 2.4 and is | ||
# actually optional in the readline API, so we must explicitly check for its | ||
|
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd use None instead of -1 for the sentinel, since it's a bit more obvious that a None index can never be actually correct. That will make the check below read
if dynload_idx is not None
, which also reads better (to me).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I'll do that. It's definitely more Pythonic, I have just gotten used to c-style '-1 index means not found'.