Now IPython works with OS X 10.5 (Leopards) libedit based readline module.

IPython/iplib.py

@@ -6,7 +6,7 b' Requires Python 2.3 or newer.'
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 2846 2007-10-24 14:44:48Z vivainio $
+$Id: iplib.py 2854 2007-11-01 20:19:34Z bgranger $
 """
 
 #*****************************************************************************
@@ -1321,11 +1321,15 b' want to merge them back into the new files.""" % locals()'
                 self.readline_startup_hook = readline.set_startup_hook
 
             # Load user's initrc file (readline config)
+			# Or if libedit is used, load editrc.
             inputrc_name = os.environ.get('INPUTRC')
             if inputrc_name is None:
                 home_dir = get_home_dir()
                 if home_dir is not None:
-                    inputrc_name = os.path.join(home_dir,'.inputrc')
+					inputrc_name = '.inputrc'
+					if readline.uses_libedit:
+						inputrc_name = '.editrc'
+					inputrc_name = os.path.join(home_dir, inputrc_name)
             if os.path.isfile(inputrc_name):
                 try:
                     readline.read_init_file(inputrc_name)
@@ -1340,6 +1344,10 b' want to merge them back into the new files.""" % locals()'
             self.set_completer()
 
             # Configure readline according to user's prefs
+			# This is only done if GNU readline is being used.	If libedit
+			# is being used (as on Leopard) the readline config is
+			# not run as the syntax for libedit is different.
+			if not readline.uses_libedit:
             for rlcommand in self.rc.readline_parse_and_bind:
                 readline.parse_and_bind(rlcommand)
 

IPython/rlineimpl.py

@@ -29,6 +29,19 b" if sys.platform == 'win32' and have_readline:"
         print "Failed GetOutputFile"
         have_readline = False
     
+# 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:
+	import commands
+	(status, result) = commands.getstatusoutput( "otool -L %s | grep libedit" % _rl.__file__ )
+	if status == 0 and len(result) > 0:
+		# we are bound to libedit - new in Leopard
+		_rl.parse_and_bind("bind ^I rl_complete")
+		print "Leopard libedit detected."
+		uses_libedit = True
+
+
 # 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:

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Brian Granger <[e-mail]>
+
+	* iplib.py, rlineimpl.py: Applied Body Water's patches to get IPython
+	working with OS X 10.5 libedit implementation of readline.
+
 2007-10-24  Ville Vainio  <[e-mail]>
 
 	* iplib.py(user_setup): To route around buggy installations where