##// END OF EJS Templates
update connections and diagrams for reduced sockets
update connections and diagrams for reduced sockets

File last commit:

r3538:7fe4c576
r3658:8fb951e7
Show More
rlineimpl.py
86 lines | 2.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
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
let add_history take strings for pyreadline <= 1.5
r3538 if have_readline and hasattr(_rl, 'rlmain'):
# patch add_history to allow for strings in pyreadline <= 1.5:
# fix copied from pyreadline 1.6
import pyreadline
if pyreadline.release.version <= '1.5':
def add_history(line):
"""add a line to the history buffer."""
from pyreadline import lineobj
if not isinstance(line, lineobj.TextLine):
line = lineobj.TextLine(line)
return _rl.add_history(line)
fperez
Fix bug with 2.3 and readline; clean up.
r644 if sys.platform == 'win32' 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:
fperez
Fix bug with 2.3 and readline; clean up.
r644 print "Failed GetOutputFile"
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.
# Thanks to Boyd Waters for this patch.
uses_libedit = False
if sys.platform == 'darwin' and have_readline:
bgranger
Changed tabs to spaces. Sorry about that :)
r890 import commands
Fernando Perez
Fix readline detection bug in OSX....
r2556 # Boyd's patch had a 'while True' here, I'm always a little worried about
# infinite loops with such code, so for now I'm taking a more conservative
# approach. See https://bugs.launchpad.net/ipython/+bug/411599.
for i in range(10):
try:
(status, result) = commands.getstatusoutput( "otool -L %s | grep libedit" % _rl.__file__ )
break
except IOError, (errno, strerror):
if errno == 4:
continue
Fernando Perez
Fix broken syntax.
r2560 else:
Fernando Perez
Fix readline detection bug in OSX....
r2556 break
bgranger
Changed tabs to spaces. Sorry about that :)
r890 if status == 0 and len(result) > 0:
# we are bound to libedit - new in Leopard
_rl.parse_and_bind("bind ^I rl_complete")
MinRK
libedit raises descriptive warning instead of simple print
r3475 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)
bgranger
Changed tabs to spaces. Sorry about that :)
r890 uses_libedit = True
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