import jsonutil from jupyter_client

IPython/html/base/zmqhandlers.py

@@ -20,7 +20,7 b' from tornado import gen, ioloop, web'
 from tornado.websocket import WebSocketHandler
 
 from IPython.kernel.zmq.session import Session
-from IPython.utils.jsonutil import date_default, extract_dates
+from jupyter_client.jsonutil import date_default, extract_dates
 from IPython.utils.py3compat import cast_unicode
 
 from .handlers import IPythonHandler

IPython/html/services/contents/handlers.py

@@ -8,7 +8,7 b' import json'
 from tornado import gen, web
 
 from IPython.html.utils import url_path_join, url_escape
-from IPython.utils.jsonutil import date_default
+from jupyter_client.jsonutil import date_default
 
 from IPython.html.base.handlers import (
     IPythonHandler, json_errors, path_regex,

IPython/html/services/kernels/handlers.py

@@ -9,7 +9,7 b' from tornado import gen, web'
 from tornado.concurrent import Future
 from tornado.ioloop import IOLoop
 
-from IPython.utils.jsonutil import date_default
+from jupyter_client.jsonutil import date_default
 from IPython.utils.py3compat import cast_unicode
 from IPython.html.utils import url_path_join, url_escape
 

IPython/html/services/sessions/handlers.py

@@ -8,7 +8,7 b' import json'
 from tornado import web
 
 from ...base.handlers import IPythonHandler, json_errors
-from IPython.utils.jsonutil import date_default
+from jupyter_client.jsonutil import date_default
 from IPython.html.utils import url_path_join, url_escape
 from IPython.kernel.kernelspec import NoSuchKernel
 

ipython_kernel/comm/comm.py

@@ -11,7 +11,7 b' from zmq.eventloop.ioloop import IOLoop'
 from IPython.config import LoggingConfigurable
 from ipython_kernel.kernelbase import Kernel
 
-from IPython.utils.jsonutil import json_clean
+from jupyter_client.jsonutil import json_clean
 from IPython.utils.traitlets import Instance, Unicode, Bytes, Bool, Dict, Any
 
 

ipython_kernel/datapub.py

@@ -14,7 +14,7 b''
 
 from IPython.config import Configurable
 from ipython_kernel.inprocess.socket import SocketABC
-from IPython.utils.jsonutil import json_clean
+from jupyter_client.jsonutil import json_clean
 from IPython.utils.traitlets import Instance, Dict, CBytes
 from ipython_kernel.serialize import serialize_object
 from ipython_kernel.session import Session, extract_header

ipython_kernel/displayhook.py

@@ -7,7 +7,7 b' import sys'
 
 from IPython.core.displayhook import DisplayHook
 from ipython_kernel.inprocess.socket import SocketABC
-from IPython.utils.jsonutil import encode_images
+from jupyter_client.jsonutil import encode_images
 from IPython.utils.py3compat import builtin_mod
 from IPython.utils.traitlets import Instance, Dict
 from .session import extract_header, Session

ipython_kernel/inprocess/ipkernel.py

@@ -8,7 +8,7 b' import logging'
 import sys
 
 from IPython.core.interactiveshell import InteractiveShellABC
-from IPython.utils.jsonutil import json_clean
+from jupyter_client.jsonutil import json_clean
 from IPython.utils.traitlets import Any, Enum, Instance, List, Type
 from ipython_kernel.ipkernel import IPythonKernel
 from ipython_kernel.zmqshell import ZMQInteractiveShell

ipython_kernel/kernelbase.py

@@ -24,7 +24,7 b' from IPython.core.error import StdinNotImplementedError'
 from IPython.core import release
 from IPython.utils import py3compat
 from IPython.utils.py3compat import unicode_type, string_types
-from IPython.utils.jsonutil import json_clean
+from jupyter_client.jsonutil import json_clean
 from IPython.utils.traitlets import (
     Any, Instance, Float, Dict, List, Set, Integer, Unicode, Bool,
 )

ipython_kernel/zmqshell.py

@@ -40,7 +40,7 b' from ipython_kernel import ('
 )
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import openpy
-from IPython.utils.jsonutil import json_clean, encode_images
+from jupyter_client.jsonutil import json_clean, encode_images
 from IPython.utils.process import arg_split
 from IPython.utils import py3compat
 from IPython.utils.py3compat import unicode_type

ipython_parallel/client/client.py

@@ -25,7 +25,7 b' from IPython.core.profiledir import ProfileDir, ProfileDirError'
 
 from IPython.utils.capture import RichOutput
 from IPython.utils.coloransi import TermColors
-from IPython.utils.jsonutil import rekey, extract_dates, parse_date
+from jupyter_client.jsonutil import rekey, extract_dates, parse_date
 from IPython.utils.localinterfaces import localhost, is_local_ip
 from IPython.utils.path import get_ipython_dir, compress_user
 from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems

ipython_parallel/controller/hub.py

@@ -20,7 +20,7 b' from zmq.eventloop.zmqstream import ZMQStream'
 
 # internal:
 from IPython.utils.importstring import import_item
-from IPython.utils.jsonutil import extract_dates
+from jupyter_client.jsonutil import extract_dates
 from IPython.utils.localinterfaces import localhost
 from IPython.utils.py3compat import cast_bytes, unicode_type, iteritems
 from IPython.utils.traitlets import (

ipython_parallel/controller/sqlitedb.py

@@ -20,7 +20,7 b' from zmq.eventloop import ioloop'
 
 from IPython.utils.traitlets import Unicode, Instance, List, Dict
 from .dictdb import BaseDB
-from IPython.utils.jsonutil import date_default, extract_dates, squash_dates
+from jupyter_client.jsonutil import date_default, extract_dates, squash_dates
 from IPython.utils.py3compat import iteritems
 
 #-----------------------------------------------------------------------------

jupyter_client/session.py

@@ -51,7 +51,7 b' from IPython.core.release import kernel_protocol_version'
 from IPython.config.configurable import Configurable, LoggingConfigurable
 from IPython.utils import io
 from IPython.utils.importstring import import_item
-from IPython.utils.jsonutil import extract_dates, squash_dates, date_default
+from jupyter_client.jsonutil import extract_dates, squash_dates, date_default
 from IPython.utils.py3compat import (str_to_bytes, str_to_unicode, unicode_type,
                                      iteritems)
 from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set,

jupyter_client/tests/test_jsonutil.py

@@ -10,9 +10,9 b' from base64 import decodestring'
 
 import nose.tools as nt
 
-from IPython.utils import jsonutil, tz
+from jupyter_client import jsonutil, tz
 from ..jsonutil import json_clean, encode_images
-from ..py3compat import unicode_to_str, str_to_bytes, iteritems
+from IPython.utils.py3compat import unicode_to_str, str_to_bytes, iteritems
 
 
 class Int(int):

jupyter_client/tests/test_session.py

@@ -14,10 +14,10 b' from zmq.tests import BaseZMQTestCase'
 from zmq.eventloop.zmqstream import ZMQStream
 
 from jupyter_client import session as ss
+from jupyter_client import jsonutil
 
 from IPython.testing.decorators import skipif, module_not_available
 from IPython.utils.py3compat import string_types
-from IPython.utils import jsonutil
 
 def _bad_packer(obj):
     raise TypeError("I don't work")