Fix a few more test failures from magic API changes.

IPython/core/magic_functions.py

@@ -3143,7 +3143,7 b' class OSMagics(Magics):'
         tgt = os.path.expanduser(unquote_filename(parameter_s))
         cwd = os.getcwdu().replace(self.shell.home_dir,'~')
         if tgt:
-            self.magic_cd(parameter_s)
+            self.cd(parameter_s)
         dir_s.insert(0,cwd)
         return self.shell.magic('dirs')
 
@@ -3154,7 +3154,7 b' class OSMagics(Magics):'
         if not self.shell.dir_stack:
             raise UsageError("%popd on empty stack")
         top = self.shell.dir_stack.pop(0)
-        self.magic_cd(top)
+        self.cd(top)
         print "popd ->",top
 
     @line_magic

IPython/core/tests/test_magic.py

@@ -29,6 +29,8 b' from IPython.utils.tempdir import TemporaryDirectory'
 # Test functions begin
 #-----------------------------------------------------------------------------
 
[e-mail]_magics
+class DummyMagics(magic.Magics): pass
 
 def test_rehashx():
     # clear up everything
@@ -53,7 +55,7 b' def test_magic_parse_options():'
     """Test that we don't mangle paths when parsing magic options."""
     ip = get_ipython()
     path = 'c:\\x'
-    m = magic.Magics(ip)
+    m = DummyMagics(ip)
     opts = m.parse_options('-f %s' % path,'f:')[0]
     # argv splitting is os-dependent
     if os.name == 'posix':
@@ -287,7 +289,7 b' def test_parse_options():'
     """Tests for basic options parsing in magics."""
     # These are only the most minimal of tests, more should be added later.  At
     # the very least we check that basic text/unicode calls work OK.
-    m = magic.Magics(ip)
+    m = DummyMagics(_ip)
     nt.assert_equal(m.parse_options('foo', '')[1], 'foo')
     nt.assert_equal(m.parse_options(u'foo', '')[1], u'foo')