diff --git a/IPython/zmq/codeutil.py b/IPython/utils/codeutil.py similarity index 100% rename from IPython/zmq/codeutil.py rename to IPython/utils/codeutil.py diff --git a/IPython/zmq/newserialized.py b/IPython/utils/newserialized.py similarity index 100% rename from IPython/zmq/newserialized.py rename to IPython/utils/newserialized.py diff --git a/IPython/zmq/pickleutil.py b/IPython/utils/pickleutil.py similarity index 100% rename from IPython/zmq/pickleutil.py rename to IPython/utils/pickleutil.py diff --git a/IPython/zmq/parallel/streamsession.py b/IPython/zmq/parallel/streamsession.py index 567fc29..7019083 100644 --- a/IPython/zmq/parallel/streamsession.py +++ b/IPython/zmq/parallel/streamsession.py @@ -14,8 +14,8 @@ import zmq from zmq.utils import jsonapi from zmq.eventloop.zmqstream import ZMQStream -from IPython.zmq.pickleutil import can, uncan, canSequence, uncanSequence -from IPython.zmq.newserialized import serialize, unserialize +from IPython.utils.pickleutil import can, uncan, canSequence, uncanSequence +from IPython.utils.newserialized import serialize, unserialize try: import cPickle