From 659282d087ce89223874d0519da431eeec8ec9ff 2012-05-26 03:25:55
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2012-05-26 03:25:55
Subject: [PATCH] Fix failing tests in core and zmq

---

diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py
index e8f3ea6..8fa2153 100644
--- a/IPython/core/tests/test_magic.py
+++ b/IPython/core/tests/test_magic.py
@@ -17,7 +17,7 @@ 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 @@ def test_timeit_arguments():
     _ip.magic("timeit ('#')")
 
 
-@dec.skipif(mf.profile is None)
+@dec.skipif(execution.profile is None)
 def test_prun_quotes():
     "Test that prun does not clobber string escapes (GH #1302)"
     _ip.magic("prun -q x = '\t'")
diff --git a/IPython/zmq/zmqshell.py b/IPython/zmq/zmqshell.py
index 518c76c..7d9a7b7 100644
--- a/IPython/zmq/zmqshell.py
+++ b/IPython/zmq/zmqshell.py
@@ -33,7 +33,7 @@ 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 @@ from IPython.zmq.displayhook import ZMQShellDisplayHook, _encode_binary
 from IPython.zmq.session import extract_header
 from session import Session
 
-
 #-----------------------------------------------------------------------------
 # Functions and classes
 #-----------------------------------------------------------------------------