##// END OF EJS Templates
Merge pull request #3734 from jdfreder/file_subdir...
Merge pull request #3734 from jdfreder/file_subdir Nbconvert: Export extracted files into `nbname_files` subdirectory Default build directory changed to . Files extracted from notebook now are placed into a ./notebook_files/ directory by default Spaces added between # symbols and comments It may be best to look at the diffs of the individual commits... The addition of spaces in the comments makes the overall diff hard to read.

File last commit:

r11068:bdc95ea1
r11642:321025c8 merge
Show More
rlineimpl.py
107 lines | 3.9 KiB | text/x-python | PythonLexer
vivainio
merge all from 0.7.3 branch to trunk
r503 # -*- coding: utf-8 -*-
fperez
Fix bug with 2.3 and readline; clean up.
r644 """ Imports and provides the 'correct' version of readline for the platform.
vivainio
merge all from 0.7.3 branch to trunk
r503
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 Readline is used throughout IPython as::
import IPython.utils.rlineimpl as readline
vivainio
merge all from 0.7.3 branch to trunk
r503
fperez
Fix bug with 2.3 and readline; clean up.
r644 In addition to normal readline stuff, this module provides have_readline
Brian Granger
Work to address the review comments on Fernando's branch....
r2498 boolean and _outputfile variable used in IPython.utils.
Fernando Perez
Remove svn-style $Id marks from docstrings and Release imports....
r1853 """
vivainio
merge all from 0.7.3 branch to trunk
r503
import sys
MinRK
libedit raises descriptive warning instead of simple print
r3475 import warnings
vivainio
merge all from 0.7.3 branch to trunk
r503
MinRK
add dirty trick for readline import on OSX...
r5206 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:
MinRK
STY: rlineimpl review from @fperez...
r5209 dynload_idx = None
MinRK
add dirty trick for readline import on OSX...
r5206 else:
sys.path.pop(dynload_idx)
fperez
Fix bug with 2.3 and readline; clean up.
r644 try:
from readline import *
import readline as _rl
have_readline = True
except ImportError:
vivainio
fixed rlineimpl to work properly with py2exed pyreadline
r671 try:
from pyreadline import *
import pyreadline as _rl
have_readline = True
MinRK
let add_history take strings for pyreadline <= 1.5
r3538 except ImportError:
vivainio
fixed rlineimpl to work properly with py2exed pyreadline
r671 have_readline = False
vivainio
merge all from 0.7.3 branch to trunk
r503
MinRK
add dirty trick for readline import on OSX...
r5206 if sys.platform == 'darwin':
# dirty trick, part II:
MinRK
STY: rlineimpl review from @fperez...
r5209 if dynload_idx is not None:
MinRK
add dirty trick for readline import on OSX...
r5206 # 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
Pawel Jasinski
color is supported in ironpython
r8573 if (sys.platform == 'win32' or sys.platform == 'cli') and have_readline:
vivainio
merge all from 0.7.3 branch to trunk
r503 try:
fperez
Fix bug with 2.3 and readline; clean up.
r644 _outputfile=_rl.GetOutputFile()
vivainio
fixed rlineimpl to work properly with py2exed pyreadline
r671 except AttributeError:
MinRK
use a bytes regex to check for libedit...
r3938 warnings.warn("Failed GetOutputFile")
fperez
Fix bug with 2.3 and readline; clean up.
r644 have_readline = False
bgranger
Now IPython works with OS X 10.5 (Leopards) libedit based readline module.
r884
# Test to see if libedit is being used instead of GNU readline.
MinRK
use Popen instead of getstatusoutput to check for libedit....
r3906 # Thanks to Boyd Waters for the original patch.
bgranger
Now IPython works with OS X 10.5 (Leopards) libedit based readline module.
r884 uses_libedit = False
MinRK
STY: rlineimpl review from @fperez...
r5209
MinRK
add dirty trick for readline import on OSX...
r5206 if have_readline:
# Official Python docs state that 'libedit' is in the docstring for libedit readline:
Christian Boos
Follow-up to 387dcd6a, `_rl.__doc__` is `None` with pyreadline
r5234 uses_libedit = _rl.__doc__ and 'libedit' in _rl.__doc__
MinRK
add dirty trick for readline import on OSX...
r5206 # 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.
MinRK
STY: rlineimpl review from @fperez...
r5209
MinRK
add dirty trick for readline import on OSX...
r5206 if uses_libedit and sys.platform == 'darwin':
_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)
bgranger
Now IPython works with OS X 10.5 (Leopards) libedit based readline module.
r884
fperez
Fix bug with 2.3 and readline; clean up.
r644 # 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
# existence. Some known platforms actually don't have it. This thread:
# http://mail.python.org/pipermail/python-dev/2003-August/037845.html
# has the original discussion.
if have_readline:
vivainio
merge all from 0.7.3 branch to trunk
r503 try:
vivainio
fixed rlineimpl to work properly with py2exed pyreadline
r671 _rl.clear_history
fperez
Fix bug with 2.3 and readline; clean up.
r644 except AttributeError:
def clear_history(): pass
Fernando Perez
Remove svn-style $Id marks from docstrings and Release imports....
r1853 _rl.clear_history = clear_history