From 3425dc1d11b4e5ca4ce37ecd2a7b5fa57ae4a838 2006-05-31 16:13:50
From: fperez
Date: 2006-05-31 16:13:50
Subject: [PATCH] Fix nasty crash from incorrect log call.

---

diff --git a/IPython/iplib.py b/IPython/iplib.py
index 8c75deb..93b806c 100644
--- a/IPython/iplib.py
+++ b/IPython/iplib.py
@@ -6,7 +6,7 @@ Requires Python 2.3 or newer.
 
 This file contains all the classes and helper functions specific to IPython.
 
-$Id: iplib.py 1335 2006-05-30 06:02:44Z fperez $
+$Id: iplib.py 1339 2006-05-31 16:13:50Z fperez $
 """
 
 #*****************************************************************************
@@ -1817,7 +1817,9 @@ want to merge them back into the new files.""" % locals()
             # blanket except, in case a user-defined prefilter crashes, so it
             # can't take all of ipython with it.
             self.showtraceback()
-        return lineout
+            return ''
+        else:
+            return lineout
         
     def split_user_input(self,line):
         """Split user input into pre-char, function part and rest."""
@@ -2020,7 +2022,7 @@ want to merge them back into the new files.""" % locals()
              (self.buffer[-1]).isspace() )):
             line = ''
 
-        self.log(line,continue_prompt)
+        self.log(line,line,continue_prompt)
         return line
 
     def handle_alias(self,line,continue_prompt=None,
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ae13ddf..10348a0 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31  Fernando Perez  <Fernando.Perez@colorado.edu>
+
+	* IPython/iplib.py (handle_normal): fix nasty crash reported on
+	SAGE list, from improper log() calls.
+
 2006-05-31  Ville Vainio  <vivainio@gmail.com>
 
 	* upgrade_dir.py, Magic.py (magic_upgrade): call upgrade_dir