Merge branch 'formatters' of http://github.com/rkern/ipython into rkern-formatters

IPython/core/displayhook.py

@@ -196,18 +196,9 b' class DisplayHook(Configurable):'
         """Compute and return the repr of the object to be displayed.
 
         This method only compute the string form of the repr and should NOT
-        actual print or write that to a stream.
+        actually print or write that to a stream.
         """
         result_repr = self.default_formatter(result)
-        if '\n' in result_repr:
-            # So that multi-line strings line up with the left column of
-            # the screen, instead of having the output prompt mess up
-            # their first line.
-            outprompt = str(self.prompt_out)
-            if outprompt and not outprompt.endswith('\n'):
-                # But avoid extraneous empty lines.
-                result_repr = '\n' + result_repr
-
         extra_formats = []
         for f in self.extra_formatters:
             try:
@@ -224,6 +215,18 b' class DisplayHook(Configurable):'
         # We want to print because we want to always make sure we have a 
         # newline, even if all the prompt separators are ''. This is the
         # standard IPython behavior.
+        if '\n' in result_repr:
+            # So that multi-line strings line up with the left column of
+            # the screen, instead of having the output prompt mess up
+            # their first line.
+            # We use the ps_out_str template instead of the expanded prompt
+            # because the expansion may add ANSI escapes that will interfere
+            # with our ability to determine whether or not we should add
+            # a newline.
+            if self.ps_out_str and not self.ps_out_str.endswith('\n'):
+                # But avoid extraneous empty lines.
+                result_repr = '\n' + result_repr
+
         print >>IPython.utils.io.Term.cout, result_repr
 
     def update_user_ns(self, result):

IPython/core/formatters.py

@@ -31,20 +31,29 b' a function.'
 
 See the `IPython.external.pretty` documentation for how to write
 pretty-printer functions.
-
-Authors:
-
-* Robert Kern
 """
-
+#-----------------------------------------------------------------------------
+# Copyright (c) 2010, IPython Development Team.
+#
+# Distributed under the terms of the Modified BSD License.
+#
+# The full license is in the file COPYING.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+# Stdlib imports
 import abc
 from cStringIO import StringIO
 
+# Our own imports
 from IPython.config.configurable import Configurable
 from IPython.external import pretty
 from IPython.utils.traitlets import Bool, Dict, Int, Str
 
 
+#-----------------------------------------------------------------------------
+# Classes and functions
+#-----------------------------------------------------------------------------
+
 class DefaultFormatter(Configurable):
     """ The default pretty-printer.
     """