Fix failing tests in core and zmq

IPython/core/tests/test_magic.py

@@ -17,7 +17,7 b' from StringIO import StringIO'
 import nose.tools as nt
 
 from IPython.core import magic
-from IPython.core import magic_functions as mf
+from IPython.core.magics import execution
 from IPython.nbformat.v3.tests.nbexamples import nb0
 from IPython.nbformat import current
 from IPython.testing import decorators as dec
@@ -429,7 +429,7 b' def test_timeit_arguments():'
     _ip.magic("timeit ('#')")
 
 
[e-mail](mf.profile is None)
[e-mail](execution.profile is None)
 def test_prun_quotes():
     "Test that prun does not clobber string escapes (GH #1302)"
     _ip.magic("prun -q x = '\t'")

IPython/zmq/zmqshell.py

@@ -33,7 +33,7 b' from IPython.core import page, pylabtools'
 from IPython.core.autocall import ZMQExitAutocall
 from IPython.core.displaypub import DisplayPublisher
 from IPython.core.macro import Macro
-from IPython.core.magic_functions import MacroToEdit
+from IPython.core.magics import MacroToEdit
 from IPython.core.payloadpage import install_payload_page
 from IPython.lib.kernel import (
     get_connection_file, get_connection_info, connect_qtconsole
@@ -49,7 +49,6 b' from IPython.zmq.displayhook import ZMQShellDisplayHook, _encode_binary'
 from IPython.zmq.session import extract_header
 from session import Session
 
-
 #-----------------------------------------------------------------------------
 # Functions and classes
 #-----------------------------------------------------------------------------