Merge pull request #1662 from bfroehle/flush_softspace

move flushing softspace to run_cell from run_code

called only once per cell

closes  #1512

IPython/core/interactiveshell.py

@@ -2563,6 +2563,11 b' class InteractiveShell(SingletonConfigurable, Magic):'
                 code = self.compile(mod, cell_name, "single")
                 if self.run_code(code):
                     return True
+
+            # Flush softspace
+            if softspace(sys.stdout, 0):
+                print
+
         except:
             # It's possible to have exceptions raised here, typically by
             # compilation of odd code (such as a naked 'return' outside a
@@ -2622,9 +2627,6 b' class InteractiveShell(SingletonConfigurable, Magic):'
             self.showtraceback()
         else:
             outflag = 0
-            if softspace(sys.stdout, 0):
-                print
-
         return outflag
 
     # For backwards compatibility

IPython/core/tests/test_interactiveshell.py

@@ -28,6 +28,7 b' from os.path import join'
 import sys
 from StringIO import StringIO
 
+from IPython.testing.decorators import skipif
 from IPython.utils import io
 
 #-----------------------------------------------------------------------------
@@ -254,6 +255,18 b' class InteractiveShellTestCase(unittest.TestCase):'
         # ZeroDivisionError
         self.assertEqual(ip.var_expand(u"{1/0}"), u"{1/0}")
 
+    @skipif(sys.version_info[0] >= 3, "softspace removed in py3")
+    def test_print_softspace(self):
+        """Verify that softspace is handled correctly when executing multiple
+        statements.
+
+        In [1]: print 1; print 2
+        1
+        2
+
+        In [2]: print 1,; print 2
+        1 2
+        """
 
 class TestSafeExecfileNonAsciiPath(unittest.TestCase):