update pickleutil imports

ipython_kernel/pickleutil.py

@@ -14,10 +14,11 b' try:'
 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

ipython_kernel/serialize.py

@@ -13,7 +13,7 b' except:'
 # 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,
 )

ipython_kernel/tests/test_pickleutil.py

@@ -2,8 +2,8 b''
 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__'

ipython_kernel/tests/test_serialize.py

@@ -11,7 +11,7 b' import nose.tools as nt'
 # 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
 

ipython_parallel/__init__.py

@@ -27,7 +27,7 b" min_pyzmq = '2.1.11'"
 
 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

ipython_parallel/client/view.py

@@ -503,7 +503,7 b' class DirectView(View):'
         
         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)

ipython_parallel/controller/dependency.py

@@ -18,7 +18,7 b' from ipython_parallel.error import UnmetDependency'
 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 b' class dependent(object):'
 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:

ipython_parallel/tests/test_dependency.py

@@ -21,7 +21,7 b' __docformat__ = "restructuredtext en"'
 # 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

jupyter_client/session.py

@@ -29,6 +29,12 b' except:'
     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
 except ImportError:
@@ -52,7 +58,6 b' from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set,'
                                         DottedObjectName, CUnicode, Dict, Integer,
                                         TraitError,
 )
-from IPython.utils.pickleutil import PICKLE_PROTOCOL
 from jupyter_client.adapter import adapt
 
 #-----------------------------------------------------------------------------