Merge branch 'fix_string_input2' into trunk

IPython/core/tests/test_interactiveshell.py

@@ -0,0 +1,37 b''
+"""Tests for the key interactiveshell module.
+
+Historically the main classes in interactiveshell have been under-tested.  This
+module should grow as many single-method tests as possible to trap many of the
+recurring bugs we seem to encounter with high-level interaction.
+
+Authors
+-------
+* Fernando Perez
+"""
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2011  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+# stdlib
+import unittest
+
+#-----------------------------------------------------------------------------
+# Tests
+#-----------------------------------------------------------------------------
+
+class InteractiveShellTestCase(unittest.TestCase):
+    def test_naked_string_cells(self):
+        """Test that cells with only naked strings are fully executed"""
+        ip = get_ipython()
+        # First, single-line inputs
+        ip.run_cell('"a"\n')
+        self.assertEquals(ip.user_ns['_'], 'a')
+        # And also multi-line cells
+        ip.run_cell('"""a\nb"""\n')
+        self.assertEquals(ip.user_ns['_'], 'a\nb')

IPython/core/displayhook.py

@@ -260,11 +260,14 b' class DisplayHook(Configurable):'
                 self.flush()
             # Don't overwrite '_' and friends if '_' is in __builtin__ (otherwise
             # we cause buggy behavior for things like gettext).
+
             if '_' not in __builtin__.__dict__:
                 self.___ = self.__
                 self.__ = self._
                 self._ = result
-                self.shell.user_ns.update({'_':self._,'__':self.__,'___':self.___})
+                self.shell.user_ns.update({'_':self._,
+                                           '__':self.__,
+                                           '___':self.___})
 
             # hackish access to top-level  namespace to create _1,_2... dynamically
             to_main = {}

IPython/core/interactiveshell.py

@@ -4,7 +4,7 b''
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2001 Janko Hauser <[e-mail]>
 #  Copyright (C) 2001-2007 Fernando Perez. <[e-mail]>
-#  Copyright (C) 2008-2010  The IPython Development Team
+#  Copyright (C) 2008-2011  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
@@ -2113,19 +2113,6 b' class InteractiveShell(Configurable, Magic):'
         self.history_manager.store_inputs(ipy_cell, cell)
 
         self.logger.log(ipy_cell, cell)
-        # dbg code!!!
-        if 0:
-            def myapp(self, val):  # dbg
-                import traceback as tb
-                stack = ''.join(tb.format_stack())
-                print 'Value:', val
-                print 'Stack:\n', stack
-                list.append(self, val)
-
-            import new
-            self.history_manager.input_hist_parsed.append = types.MethodType(myapp,
-                                                                            self.history_manager.input_hist_parsed)
-        # End dbg
 
         # All user code execution must happen with our context managers active
         with nested(self.builtin_trap, self.display_trap):
@@ -2167,15 +2154,31 b' class InteractiveShell(Configurable, Magic):'
         self.execution_count += 1
 
     def run_one_block(self, block):
-        """Run a single interactive block.
+        """Run a single interactive block of source code.
 
         If the block is single-line, dynamic transformations are applied to it
         (like automagics, autocall and alias recognition).
+
+        If the block is multi-line, it must consist of valid Python code only.
+
+        Parameters
+        ----------
+        block : string
+           A (possibly multiline) string of code to be executed.
+
+        Returns
+        -------
+        The output of the underlying execution method used, be it
+        :meth:`run_source` or :meth:`run_single_line`.
         """
         if len(block.splitlines()) <= 1:
             out = self.run_single_line(block)
         else:
-            out = self.run_code(block)
+            # Call run_source, which correctly compiles the input cell.
+            # run_code must only be called when we know we have a code object,
+            # as it does a naked exec and the compilation mode may not be what
+            # we wanted.
+            out = self.run_source(block)
         return out
 
     def run_single_line(self, line):
@@ -2329,7 +2332,7 b' class InteractiveShell(Configurable, Magic):'
         try:
             try:
                 self.hooks.pre_run_code_hook()
-                #rprint('Running code') # dbg
+                #rprint('Running code', repr(code_obj)) # dbg
                 exec code_obj in self.user_global_ns, self.user_ns
             finally:
                 # Reset our crash handler in place

IPython/core/tests/test_inputsplitter.py

@@ -1,5 +1,10 b''
 # -*- coding: utf-8 -*-
 """Tests for the inputsplitter module.
+
+Authors
+-------
+* Fernando Perez
+* Robert Kern
 """
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2010  The IPython Development Team

IPython/testing/globalipapp.py

@@ -68,11 +68,19 b' class ipnsdict(dict):'
     This subclass adds a simple checkpointing capability so that when testing
     machinery clears it (we use it as the test execution context), it doesn't
     get completely destroyed.
+
+    In addition, it can handle the presence of the '_' key in a special manner,
+    which is needed because of how Python's doctest machinery operates with
+    '_'.  See constructor and :meth:`update` for details.
     """
     
     def __init__(self,*a):
         dict.__init__(self,*a)
         self._savedict = {}
+        # If this flag is True, the .update() method will unconditionally
+        # remove a key named '_'.  This is so that such a dict can be used as a
+        # namespace in doctests that call '_'.
+        self.protect_underscore = False
         
     def clear(self):
         dict.clear(self)
@@ -86,10 +94,15 b' class ipnsdict(dict):'
         self._checkpoint()
         dict.update(self,other)
 
-        # If '_' is in the namespace, python won't set it when executing code,
-        # and we have examples that test it.  So we ensure that the namespace
-        # is always 'clean' of it before it's used for test code execution.
-        self.pop('_',None)
+        if self.protect_underscore:
+            # If '_' is in the namespace, python won't set it when executing
+            # code *in doctests*, and we have multiple doctests that use '_'.
+            # So we ensure that the namespace is always 'clean' of it before
+            # it's used for test code execution.
+            # This flag is only turned on by the doctest machinery, so that
+            # normal test code can assume the _ key is updated like any other
+            # key and can test for its presence after cell executions.
+            self.pop('_', None)
 
         # The builtins namespace must *always* be the real __builtin__ module,
         # else weird stuff happens.  The main ipython code does have provisions

IPython/testing/ipunittest.py

@@ -39,11 +39,7 b' from __future__ import absolute_import'
 import re
 import sys
 import unittest
-from doctest import DocTestFinder, DocTestRunner
-try:
-    from doctest import TestResults
-except:
-    from ._doctest26 import TestResults
+from doctest import DocTestFinder, DocTestRunner, TestResults
 
 # We already have python3-compliant code for parametric tests
 if sys.version[0]=='2':

IPython/testing/plugin/ipdoctest.py

@@ -273,6 +273,10 b' class DocTestCase(doctests.DocTestCase):'
             # fills with the necessary info from the module being tested).
             _ip.user_ns.update(self._dt_test.globs)
             self._dt_test.globs = _ip.user_ns
+            # IPython must protect the _ key in the namespace (it can't exist)
+            # so that Python's doctest code sets it naturally, so we enable
+            # this feature of our testing namespace.
+            _ip.user_ns.protect_underscore = True
 
         super(DocTestCase, self).setUp()
 
@@ -282,6 +286,9 b' class DocTestCase(doctests.DocTestCase):'
         # teardown doesn't destroy the ipython namespace
         if isinstance(self._dt_test.examples[0],IPExample):
             self._dt_test.globs = self._dt_test_globs_ori
+            # Restore the behavior of the '_' key in the user namespace to
+            # normal after each doctest, so that unittests behave normally
+            _ip.user_ns.protect_underscore = False
             
         # XXX - fperez: I am not sure if this is truly a bug in nose 0.11, but
         # it does look like one to me: its tearDown method tries to run