From f179c85c08c4dc100014b53dc0885274a906120d 2012-05-26 03:20:02
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2012-05-26 03:20:02
Subject: [PATCH] Fix import for zmqshell

---

diff --git a/IPython/zmq/zmqshell.py b/IPython/zmq/zmqshell.py
index b8d420f..518c76c 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 import MacroToEdit
+from IPython.core.magic_functions import MacroToEdit
 from IPython.core.payloadpage import install_payload_page
 from IPython.lib.kernel import (
     get_connection_file, get_connection_info, connect_qtconsole