Fix a number of bugs with %history, add proper tests.

- Closes  #295371.

IPython/history.py

@@ -1,5 +1,4 b''
 # -*- coding: utf-8 -*-
-
 """ History related magics and functionality """
 
 # Stdlib imports
@@ -7,7 +6,7 b' import fnmatch'
 import os
 
 # IPython imports
-from IPython.genutils import Term, ask_yes_no
+from IPython.genutils import Term, ask_yes_no, warn
 import IPython.ipapi
 
 def magic_history(self, parameter_s = ''):
@@ -47,8 +46,6 b" def magic_history(self, parameter_s = ''):"
       -f FILENAME: instead of printing the output to the screen, redirect it to
        the given file.  The file is always overwritten, though IPython asks for
        confirmation first if it already exists.
-      
-
     """
 
     ip = self.api
@@ -62,31 +59,28 b" def magic_history(self, parameter_s = ''):"
     try:
         outfname = opts['f']
     except KeyError:
-        outfile = Term.cout
+        outfile = Term.cout  # default
         # We don't want to close stdout at the end!
         close_at_end = False
     else:
         if os.path.exists(outfname):
-            ans = ask_yes_no("File %r exists. Overwrite?" % outfname)
-            if not ans:
+            if not ask_yes_no("File %r exists. Overwrite?" % outfname): 
                 print 'Aborting.'
                 return
-            else:
-                outfile = open(outfname,'w')
-                close_at_end = True
-                
 
-    if opts.has_key('t'):
+        outfile = open(outfname,'w')
+        close_at_end = True
+
+    if 't' in opts:
         input_hist = shell.input_hist
-    elif opts.has_key('r'):
+    elif 'r' in opts:
         input_hist = shell.input_hist_raw
     else:
         input_hist = shell.input_hist
-        
-    
+            
     default_length = 40
     pattern = None
-    if opts.has_key('g'):
+    if 'g' in opts:
         init = 1
         final = len(input_hist)
         parts = parameter_s.split(None,1)
@@ -138,13 +132,11 b" def magic_history(self, parameter_s = ''):"
         outfile.close()
 
 
-
 def magic_hist(self, parameter_s=''):
     """Alternate name for %history."""
     return self.magic_history(parameter_s)
 
 
-
 def rep_f(self, arg):
     r""" Repeat a command, or get command to input line for editing
 
@@ -173,11 +165,9 b' def rep_f(self, arg):'
     %rep foo
     
     Place the most recent line that has the substring "foo" to next input.
-    (e.g. 'svn ci -m foobar').
-    
+    (e.g. 'svn ci -m foobar').    
     """
     
-    
     opts,args = self.parse_options(arg,'',mode='list')
     ip = self.api    
     if not args:
@@ -206,7 +196,6 b' def rep_f(self, arg):'
                 ip.set_next_input(str(h).rstrip())
                 return
         
-
     try:
         lines = self.extract_input_slices(args, True)
         print "lines",lines
@@ -215,7 +204,6 b' def rep_f(self, arg):'
         print "Not found in recent history:", args
         
 
-
 _sentinel = object()
 
 class ShadowHist:
@@ -259,23 +247,12 b' class ShadowHist:'
             if k == idx:
                 return v
 
-def test_shist():
-    from IPython.Extensions import pickleshare
-    db = pickleshare.PickleShareDB('~/shist')
-    s = ShadowHist(db)
-    s.add('hello')
-    s.add('world')
-    s.add('hello')
-    s.add('hello')
-    s.add('karhu')
-    print "all",s.all()
-    print s.get(2)
 
 def init_ipython(ip):
+    import ipy_completers
+
     ip.expose_magic("rep",rep_f)        
     ip.expose_magic("hist",magic_hist)            
     ip.expose_magic("history",magic_history)
 
-    import ipy_completers
     ipy_completers.quick_completer('%hist' ,'-g -t -r -n')
-#test_shist()

IPython/testing/plugin/ipdoctest.py

@@ -65,13 +65,28 b' log = logging.getLogger(__name__)'
 # test globals.  Once we move over to a clean magic system, this will be done
 # with much less ugliness.
 
+class py_file_finder(object):
+    def __init__(self,test_filename):
+        self.test_filename = test_filename
+        
+    def __call__(self,name):
+        from IPython.genutils import get_py_filename
+        try:
+            get_py_filename(name)
+        except IOError:
+            test_dir = os.path.dirname(self.test_filename)
+            new_path = os.path.join(test_dir,name)
+            return get_py_filename(new_path)
+    
+
 def _run_ns_sync(self,arg_s,runner=None):
     """Modified version of %run that syncs testing namespaces.
 
     This is strictly needed for running doctests that call %run.
     """
 
-    out = _ip.IP.magic_run_ori(arg_s,runner)
+    finder = py_file_finder(_run_ns_sync.test_filename)
+    out = _ip.IP.magic_run_ori(arg_s,runner,finder)
     _run_ns_sync.test_globs.update(_ip.user_ns)
     return out
 
@@ -129,8 +144,7 b' def start_ipython():'
 
     # Start IPython instance.  We customize it to start with minimal frills.
     user_ns,global_ns = IPython.ipapi.make_user_namespaces(ipnsdict(),dict())
-    
-    IPython.Shell.IPShell(['--classic','--noterm_title'],
+    IPython.Shell.IPShell(['--colors=NoColor','--noterm_title'],
                           user_ns,global_ns)
 
     # Deactivate the various python system hooks added by ipython for
@@ -638,7 +652,8 b' class IPDocTestRunner(doctest.DocTestRunner,object):'
         # when called (rather than unconconditionally updating test.globs here
         # for all examples, most of which won't be calling %run anyway).
         _run_ns_sync.test_globs = test.globs
-
+        _run_ns_sync.test_filename = test.filename
+        
         return super(IPDocTestRunner,self).run(test,
                                                compileflags,out,clear_globs)
 

IPython/tests/test_magic.py

@@ -1,8 +1,10 b''
 """ Tests for various magic functions
 
 Needs to be run by nose (to make ipython session available)
-
 """
+
+from IPython.testing import decorators as dec
+
 def test_rehashx():
     # clear up everything
     _ip.IP.alias_table.clear()
@@ -19,3 +21,72 b' def test_rehashx():'
     # rehashx must fill up syscmdlist
     scoms = _ip.db['syscmdlist']
     assert len(scoms) > 10
+
+
+def doctest_run_ns():
+    """Classes declared %run scripts must be instantiable afterwards.
+
+    In [3]: run tclass.py
+
+    In [4]: f()
+    """
+    pass # doctest only
+
+
+def doctest_hist_f():
+    """Test %hist -f with temporary filename.
+
+    In [9]: import tempfile
+
+    In [10]: tfile = tempfile.mktemp('.py','tmp-ipython-')
+
+    In [11]: %history -n -f $tfile 3
+    """
+
+
+def doctest_hist_r():
+    """Test %hist -r
+
+    XXX - This test is not recording the output correctly.  Not sure why...
+
+    In [6]: x=1
+
+    In [7]: hist -n -r 2
+    x=1  # random
+    hist -n -r 2  # random
+    """
+
+
+def test_shist():
+    # Simple tests of ShadowHist class
+    import os, shutil, tempfile
+    import nose.tools as nt
+
+    from IPython.Extensions import pickleshare
+    from IPython.history import ShadowHist
+    
+
+    tfile = tempfile.mktemp('','tmp-ipython-')
+    
+    db = pickleshare.PickleShareDB(tfile)
+    s = ShadowHist(db)
+    s.add('hello')
+    s.add('world')
+    s.add('hello')
+    s.add('hello')
+    s.add('karhu')
+
+    yield nt.assert_equals,s.all(),[(1, 'hello'), (2, 'world'), (3, 'karhu')]
+    
+    yield nt.assert_equal,s.get(2),'world'
+    
+    shutil.rmtree(tfile)
+    
+
[e-mail]_numpy_not_avail
+def doctest_clear_array():
+    """Check that array clearing works.
+
+    >>> 1/0
+    """
+    pass # doctest only