mirror of
https://github.com/jupyter/notebook.git
synced 2025-01-12 11:45:38 +08:00
Drop use of deprecated pyzmq.ioloop
This commit is contained in:
parent
a9f0469709
commit
198178f4bf
@ -44,11 +44,6 @@ from jinja2 import Environment, FileSystemLoader
|
|||||||
|
|
||||||
from notebook.transutils import trans, _
|
from notebook.transutils import trans, _
|
||||||
|
|
||||||
# Install the pyzmq ioloop. This has to be done before anything else from
|
|
||||||
# tornado is imported.
|
|
||||||
from zmq.eventloop import ioloop
|
|
||||||
ioloop.install()
|
|
||||||
|
|
||||||
# check for tornado 3.1.0
|
# check for tornado 3.1.0
|
||||||
try:
|
try:
|
||||||
import tornado
|
import tornado
|
||||||
@ -62,6 +57,7 @@ if version_info < (5,0):
|
|||||||
raise ImportError(_("The Jupyter Notebook requires tornado >= 5.0, but you have %s") % tornado.version)
|
raise ImportError(_("The Jupyter Notebook requires tornado >= 5.0, but you have %s") % tornado.version)
|
||||||
|
|
||||||
from tornado import httpserver
|
from tornado import httpserver
|
||||||
|
from tornado import ioloop
|
||||||
from tornado import web
|
from tornado import web
|
||||||
from tornado.httputil import url_concat
|
from tornado.httputil import url_concat
|
||||||
from tornado.log import LogFormatter, app_log, access_log, gen_log
|
from tornado.log import LogFormatter, app_log, access_log, gen_log
|
||||||
|
Loading…
Reference in New Issue
Block a user