Fix small inconsistency in display hook (needed for a SAGE fix)

IPython/Prompts.py

@@ -2,7 +2,7 b''
 """
 Classes for handling input/output prompts.
 
-$Id: Prompts.py 1272 2006-04-25 17:04:17Z vivainio $"""
+$Id: Prompts.py 1303 2006-05-17 03:39:29Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez <[e-mail]>
@@ -23,7 +23,6 b' import os'
 import socket
 import sys
 import time
-from pprint import pprint,pformat
 
 # IPython's own
 from IPython import ColorANSI

IPython/hooks.py

@@ -32,7 +32,7 b" ip.set_hook('editor', calljed)"
 You can then enable the functionality by doing 'import myiphooks'
 somewhere in your configuration files or ipython command line.
 
-$Id: hooks.py 1274 2006-04-26 14:01:37Z vivainio $"""
+$Id: hooks.py 1303 2006-05-17 03:39:29Z fperez $"""
 
 #*****************************************************************************
 #       Copyright (C) 2005 Fernando Perez. <[e-mail]>
@@ -49,13 +49,15 b' __version__ = Release.version'
 
 import os,bisect
 from genutils import Term
-from pprint import pformat
+from pprint import PrettyPrinter
 
 # List here all the default hooks.  For now it's just the editor functions
 # but over time we'll move here all the public API for user-accessible things.
 __all__ = ['editor', 'fix_error_editor', 'result_display',
            'input_prefilter', 'shutdown_hook', 'late_startup_hook']
 
+pformat = PrettyPrinter().pformat
+
 def editor(self,filename, linenum=None):
     """Open the default editor at the given filename and linenumber.
 
@@ -157,8 +159,11 b' def result_display(self,arg):'
             Term.cout.write('\n')
         print >>Term.cout, out
     else:
-        print >>Term.cout, arg
-    # the default display hook doesn't manipulate the value to put in history    
+        # By default, the interactive prompt uses repr() to display results,
+        # so we should honor this.  Users who'd rather use a different
+        # mechanism can easily override this hook.
+        print >>Term.cout, repr(arg)
+    # the default display hook doesn't manipulate the value to put in history
     return None 
 
 def input_prefilter(self,line):     

doc/ChangeLog

@@ -1,8 +1,14 b''
[phone]  Fernando Perez  <[e-mail]>
+
+	* IPython/hooks.py (result_display): Fix the fact that our display
+	hook was using str() instead of repr(), as the default python
+	console does.  This had gone unnoticed b/c it only happened if
+	%Pprint was off, but the inconsistency was there.
+
 2006-05-15  Ville Vainio  <[e-mail]>
 
 	* Oinspect.py: Only show docstring for nonexisting/binary files
 	when doing object??, closing ticket #62
-	
 
 2006-05-13  Fernando Perez  <[e-mail]>