Show More
@@ -33,6 +33,9 b' from multiprocessing import Process' | |||||
33 | import zmq |
|
33 | import zmq | |
34 | from zmq.devices import ProcessMonitoredQueue |
|
34 | from zmq.devices import ProcessMonitoredQueue | |
35 | from zmq.log.handlers import PUBHandler |
|
35 | from zmq.log.handlers import PUBHandler | |
|
36 | ||||
|
37 | # Note: use our own import to work around jsonlib api mismatch. When these | |||
|
38 | # changes propagate to zmq, revert back to the following line instead: | |||
36 | #from zmq.utils import jsonapi as json |
|
39 | #from zmq.utils import jsonapi as json | |
37 | from IPython.zmq import jsonapi as json |
|
40 | from IPython.zmq import jsonapi as json | |
38 |
|
41 |
@@ -11,6 +11,9 b' import sys' | |||||
11 | import tempfile |
|
11 | import tempfile | |
12 |
|
12 | |||
13 | # System library imports |
|
13 | # System library imports | |
|
14 | ||||
|
15 | # Note: use our own import to work around jsonlib api mismatch. When these | |||
|
16 | # changes propagate to zmq, revert back to the following line instead: | |||
14 | #from zmq.utils import jsonapi as json |
|
17 | #from zmq.utils import jsonapi as json | |
15 | from IPython.zmq import jsonapi as json |
|
18 | from IPython.zmq import jsonapi as json | |
16 |
|
19 |
General Comments 0
You need to be logged in to leave comments.
Login now