Merge pull request #3506 from takluyver/storemagic_restore_aliases

%store -r restores saved aliases and directory history, as well as variables

IPython/extensions/tests/test_storemagic.py

@@ -0,0 +1,32 b''
+import tempfile, os
+
+import nose.tools as nt
+
+ip = get_ipython()
+ip.magic('load_ext storemagic')
+
+def test_store_restore():
+    ip.user_ns['foo'] = 78
+    ip.magic('alias bar echo "hello"')
+    tmpd = tempfile.mkdtemp()
+    ip.magic('cd ' + tmpd)
+    ip.magic('store foo')
+    ip.magic('store bar')
+    
+    # Check storing
+    nt.assert_equal(ip.db['autorestore/foo'], 78)
+    nt.assert_in('bar', ip.db['stored_aliases'])
+    
+    # Remove those items
+    ip.user_ns.pop('foo', None)
+    ip.alias_manager.undefine_alias('bar')
+    ip.magic('cd -')
+    ip.user_ns['_dh'][:] = []
+    
+    # Check restoring
+    ip.magic('store -r')
+    nt.assert_equal(ip.user_ns['foo'], 78)
+    nt.assert_in('bar', ip.alias_manager.alias_table)
+    nt.assert_in(tmpd, ip.user_ns['_dh'])
+    
+    os.rmdir(tmpd)

IPython/extensions/storemagic.py

@@ -144,7 +144,7 b' class StoreMagics(Magics):'
                     else:
                         ip.user_ns[arg] = obj
             else:
-                refresh_variables(ip)
+                restore_data(ip)
 
         # run without arguments -> list variables & values
         elif not args: