From a26833c026420ec9596a739799451a0e238eeb16 2005-08-19 17:37:46
From: fperez
Date: 2005-08-19 17:37:46
Subject: [PATCH] Close http://www.scipy.net/roundup/ipython/issue40, add OSX install info to
manual.

---

diff --git a/IPython/iplib.py b/IPython/iplib.py
index 6d467ea..0779094 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -6,7 +6,7 @@ Requires Python 2.1 or newer.
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 703 2005-08-16 17:34:44Z fperez $
+$Id: iplib.py 723 2005-08-19 17:37:46Z fperez $
 """
 
 #*****************************************************************************
@@ -688,6 +688,9 @@ class InteractiveShell(code.InteractiveConsole, Logger, Magic):
         # temporary files used for various purposes.  Deleted at exit.
         self.tempfiles = []
 
+        # Keep track of readline usage (later set by init_readline)
+        self.has_readline = 0
+
         # for pushd/popd management
         try:
             self.home_dir = get_home_dir()
diff --git a/doc/ChangeLog b/doc/ChangeLog
index c7777cd..9fb18dd 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-19  Fernando Perez  <Fernando.Perez@colorado.edu>
+
+	* IPython/iplib.py (InteractiveShell.__init__): Add has_readline
+	attribute to self, which was missing.  Before, it was set by a
+	routine which in certain cases wasn't being called, so the
+	instance could end up missing the attribute.  This caused a crash.
+	Closes http://www.scipy.net/roundup/ipython/issue40.
+
 2005-08-16  Fernando Perez  <fperez@colorado.edu>
 
 	* IPython/ultraTB.py (VerboseTB.text): don't crash if object
diff --git a/doc/manual_base.lyx b/doc/manual_base.lyx
index 5031150..f3279ec 100644
--- a/doc/manual_base.lyx
+++ b/doc/manual_base.lyx
@@ -649,6 +649,25 @@ IPython/
 \layout Subsubsection
 
 Mac OSX information
+\layout Standard
+
+Under OSX, there is a choice you need to make.
+ Apple ships its own build of Python, which lives in the core OSX filesystem
+ hierarchy.
+ You can also manually install a separate Python, either purely by hand
+ (typically in 
+\family typewriter 
+/usr/local
+\family default 
+) or by using Fink, which puts everything under 
+\family typewriter 
+/sw
+\family default 
+.
+ Which route to follow is a matter of personal preference, as I've seen
+ users who favor each of the approaches.
+ Here I will simply list the known installation issues under OSX, along
+ with their solutions.
 \layout Subsubsection*
 
 GUI problems
@@ -778,11 +797,33 @@ not
  
 \layout Standard
 
-At this point I don't know of such a released version for OSX 10.4 (Tiger),
- or if the problem even occurs with Tiger at all (feedback welcome).
+Install this package, then you need to either: 
+\layout Enumerate
+
+Move 
+\family typewriter 
+readline.so
+\family default 
+ from 
+\family typewriter 
+/Library/Python/2.3
+\family default 
+ to 
+\family typewriter 
+/Library/Python/2.3/site-packages
+\family default 
+.
+\layout Enumerate
+
+Install 
+\begin_inset LatexCommand \htmlurl{http://ipython.scipy.org/tmp/scipy_cvs_2005-07-29.tgz}
+
+\end_inset 
+
+
 \layout Standard
 
-Users installing against fink's Python or a properly hand-built one should
+Users installing against Fink's Python or a properly hand-built one should
  not have this problem.
 \layout Subsection