Show More
@@ -22,9 +22,7 b' from subprocess import Popen, PIPE' | |||||
22 | import tempfile |
|
22 | import tempfile | |
23 |
|
23 | |||
24 | import zmq |
|
24 | import zmq | |
25 |
|
25 | from zmq.ssh import tunnel | ||
26 | # external imports |
|
|||
27 | from IPython.external.ssh import tunnel |
|
|||
28 |
|
26 | |||
29 | # IPython imports |
|
27 | # IPython imports | |
30 | from IPython.config import LoggingConfigurable |
|
28 | from IPython.config import LoggingConfigurable |
@@ -18,6 +18,7 b' from pprint import pprint' | |||||
18 | pjoin = os.path.join |
|
18 | pjoin = os.path.join | |
19 |
|
19 | |||
20 | import zmq |
|
20 | import zmq | |
|
21 | from zmq.ssh import tunnel | |||
21 |
|
22 | |||
22 | from IPython.config.configurable import MultipleInstanceError |
|
23 | from IPython.config.configurable import MultipleInstanceError | |
23 | from IPython.core.application import BaseIPythonApplication |
|
24 | from IPython.core.application import BaseIPythonApplication | |
@@ -32,7 +33,6 b' from IPython.utils.py3compat import cast_bytes, string_types, xrange, iteritems' | |||||
32 | from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode, |
|
33 | from IPython.utils.traitlets import (HasTraits, Integer, Instance, Unicode, | |
33 | Dict, List, Bool, Set, Any) |
|
34 | Dict, List, Bool, Set, Any) | |
34 | from IPython.external.decorator import decorator |
|
35 | from IPython.external.decorator import decorator | |
35 | from IPython.external.ssh import tunnel |
|
|||
36 |
|
36 | |||
37 | from IPython.parallel import Reference |
|
37 | from IPython.parallel import Reference | |
38 | from IPython.parallel import error |
|
38 | from IPython.parallel import error |
@@ -14,9 +14,8 b' from getpass import getpass' | |||||
14 |
|
14 | |||
15 | import zmq |
|
15 | import zmq | |
16 | from zmq.eventloop import ioloop, zmqstream |
|
16 | from zmq.eventloop import ioloop, zmqstream | |
|
17 | from zmq.ssh import tunnel | |||
17 |
|
18 | |||
18 | from IPython.external.ssh import tunnel |
|
|||
19 | # internal |
|
|||
20 | from IPython.utils.localinterfaces import localhost |
|
19 | from IPython.utils.localinterfaces import localhost | |
21 | from IPython.utils.traitlets import ( |
|
20 | from IPython.utils.traitlets import ( | |
22 | Instance, Dict, Integer, Type, Float, Integer, Unicode, CBytes, Bool |
|
21 | Instance, Dict, Integer, Type, Float, Integer, Unicode, CBytes, Bool |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now