update pickleutil imports

minrk · minrk · commit 1fdd9cb121ee · 2015-04-02T11:39:53.000-07:00
diff --git a/ipython_kernel/pickleutil.py b/ipython_kernel/pickleutil.py
@@ -14,10 +14,11 @@
 except ImportError:
     import pickle
 
+from IPython.utils import py3compat
+from IPython.utils.importstring import import_item
+from IPython.utils.py3compat import string_types, iteritems, buffer_to_bytes_py2
+
 from . import codeutil  # This registers a hook when it's imported
-from . import py3compat
-from .importstring import import_item
-from .py3compat import string_types, iteritems, buffer_to_bytes_py2
 
 from IPython.config import Application
 from IPython.utils.log import get_logger
diff --git a/ipython_kernel/serialize.py b/ipython_kernel/serialize.py
@@ -13,7 +13,7 @@
 # IPython imports
 from IPython.utils.py3compat import PY3, buffer_to_bytes_py2
 from IPython.utils.data import flatten
-from IPython.utils.pickleutil import (
+from ipython_kernel.pickleutil import (
     can, uncan, can_sequence, uncan_sequence, CannedObject,
     istype, sequence_types, PICKLE_PROTOCOL,
 )
diff --git a/ipython_kernel/tests/test_pickleutil.py b/ipython_kernel/tests/test_pickleutil.py
@@ -2,8 +2,8 @@
 import pickle
 
 import nose.tools as nt
-from IPython.utils import codeutil
-from IPython.utils.pickleutil import can, uncan
+from ipython_kernel import codeutil
+from ipython_kernel.pickleutil import can, uncan
 
 def interactive(f):
     f.__module__ = '__main__'
diff --git a/ipython_kernel/tests/test_serialize.py b/ipython_kernel/tests/test_serialize.py
@@ -11,7 +11,7 @@
 # from unittest import TestCaes
 from ipython_kernel.serialize import serialize_object, deserialize_object
 from IPython.testing import decorators as dec
-from IPython.utils.pickleutil import CannedArray, CannedClass
+from ipython_kernel.pickleutil import CannedArray, CannedClass
 from IPython.utils.py3compat import iteritems
 from IPython.parallel import interactive
 
diff --git a/ipython_parallel/__init__.py b/ipython_parallel/__init__.py
@@ -27,7 +27,7 @@
 
 check_for_zmq(min_pyzmq, 'ipython_parallel')
 
-from IPython.utils.pickleutil import Reference
+from ipython_kernel.pickleutil import Reference
 
 from .client.asyncresult import *
 from .client.client import Client
diff --git a/ipython_parallel/client/view.py b/ipython_parallel/client/view.py
@@ -503,7 +503,7 @@ def use_dill(self):
         
         adds support for closures, etc.
         
-        This calls IPython.utils.pickleutil.use_dill() here and on each engine.
+        This calls ipython_kernel.pickleutil.use_dill() here and on each engine.
         """
         pickleutil.use_dill()
         return self.apply(pickleutil.use_dill)
diff --git a/ipython_parallel/controller/dependency.py b/ipython_parallel/controller/dependency.py
@@ -18,7 +18,7 @@
 from ipython_parallel.util import interactive
 from IPython.utils import py3compat
 from IPython.utils.py3compat import string_types
-from IPython.utils.pickleutil import can, uncan
+from ipython_kernel.pickleutil import can, uncan
 
 class depend(object):
     """Dependency decorator, for use with tasks.
@@ -81,7 +81,7 @@ def __name__(self):
 def _require(*modules, **mapping):
     """Helper for @require decorator."""
     from ipython_parallel.error import UnmetDependency
-    from IPython.utils.pickleutil import uncan
+    from ipython_kernel.pickleutil import uncan
     user_ns = globals()
     for name in modules:
         try:
diff --git a/ipython_parallel/tests/test_dependency.py b/ipython_parallel/tests/test_dependency.py
@@ -21,7 +21,7 @@
 # import
 import os
 
-from IPython.utils.pickleutil import can, uncan
+from ipython_kernel.pickleutil import can, uncan
 
 import ipython_parallel as pmod
 from ipython_parallel.util import interactive
diff --git a/jupyter_client/session.py b/jupyter_client/session.py
@@ -28,6 +28,12 @@
     cPickle = None
     import pickle
 
+try:
+    # py3
+    PICKLE_PROTOCOL = pickle.DEFAULT_PROTOCOL
+except AttributeError:
+    PICKLE_PROTOCOL = pickle.HIGHEST_PROTOCOL
+
 try:
     # We are using compare_digest to limit the surface of timing attacks
     from hmac import compare_digest
@@ -52,7 +58,6 @@ def compare_digest(a,b): return a == b
                                         DottedObjectName, CUnicode, Dict, Integer,
                                         TraitError,
 )
-from IPython.utils.pickleutil import PICKLE_PROTOCOL
 from jupyter_client.adapter import adapt
 
 #-----------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`# IPython imports`
`14`	`14`	`from IPython.utils.py3compat import PY3, buffer_to_bytes_py2`
`15`	`15`	`from IPython.utils.data import flatten`
`16`		`-from IPython.utils.pickleutil import (`
	`16`	`+from ipython_kernel.pickleutil import (`
`17`	`17`	`can, uncan, can_sequence, uncan_sequence, CannedObject,`
`18`	`18`	`istype, sequence_types, PICKLE_PROTOCOL,`
`19`	`19`	`)`