Show More
@@ -1,20 +1,7 b'' | |||||
1 | """The IPython HTML Notebook""" |
|
1 | """The IPython HTML Notebook""" | |
2 |
|
2 | |||
3 | # check for tornado 2.1.0 |
|
3 | import os | |
4 | msg = "The IPython Notebook requires tornado >= 2.1.0" |
|
4 | # Packagers: modify this line if you store the notebook static files elsewhere | |
5 | try: |
|
5 | DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static") | |
6 | import tornado |
|
|||
7 | except ImportError: |
|
|||
8 | raise ImportError(msg) |
|
|||
9 | try: |
|
|||
10 | version_info = tornado.version_info |
|
|||
11 | except AttributeError: |
|
|||
12 | raise ImportError(msg + ", but you have < 1.1.0") |
|
|||
13 | if version_info < (2,1,0): |
|
|||
14 | raise ImportError(msg + ", but you have %s" % tornado.version) |
|
|||
15 | del msg |
|
|||
16 |
|
6 | |||
17 | # check for pyzmq 2.1.4 |
|
7 | del os | |
18 | from IPython.kernel.zmq import check_for_zmq |
|
|||
19 | check_for_zmq('2.1.4', 'IPython.frontend.html.notebook') |
|
|||
20 | del check_for_zmq |
|
@@ -31,7 +31,12 b' import time' | |||||
31 | import uuid |
|
31 | import uuid | |
32 | import webbrowser |
|
32 | import webbrowser | |
33 |
|
33 | |||
|
34 | ||||
34 | # Third party |
|
35 | # Third party | |
|
36 | # check for pyzmq 2.1.11 (this is actually redundant) | |||
|
37 | from IPython.kernel.zmq import check_for_zmq | |||
|
38 | check_for_zmq('2.1.11', 'IPython.frontend.html.notebook') | |||
|
39 | ||||
35 | import zmq |
|
40 | import zmq | |
36 | from jinja2 import Environment, FileSystemLoader |
|
41 | from jinja2 import Environment, FileSystemLoader | |
37 |
|
42 | |||
@@ -40,11 +45,24 b' from jinja2 import Environment, FileSystemLoader' | |||||
40 | from zmq.eventloop import ioloop |
|
45 | from zmq.eventloop import ioloop | |
41 | ioloop.install() |
|
46 | ioloop.install() | |
42 |
|
47 | |||
43 | import tornado |
|
48 | # check for tornado 2.1.0 | |
|
49 | msg = "The IPython Notebook requires tornado >= 2.1.0" | |||
|
50 | try: | |||
|
51 | import tornado | |||
|
52 | except ImportError: | |||
|
53 | raise ImportError(msg) | |||
|
54 | try: | |||
|
55 | version_info = tornado.version_info | |||
|
56 | except AttributeError: | |||
|
57 | raise ImportError(msg + ", but you have < 1.1.0") | |||
|
58 | if version_info < (2,1,0): | |||
|
59 | raise ImportError(msg + ", but you have %s" % tornado.version) | |||
|
60 | ||||
44 | from tornado import httpserver |
|
61 | from tornado import httpserver | |
45 | from tornado import web |
|
62 | from tornado import web | |
46 |
|
63 | |||
47 | # Our own libraries |
|
64 | # Our own libraries | |
|
65 | from IPython.frontend.html.notebook import DEFAULT_STATIC_FILES_PATH | |||
48 | from .kernelmanager import MappingKernelManager |
|
66 | from .kernelmanager import MappingKernelManager | |
49 | from .handlers import (LoginHandler, LogoutHandler, |
|
67 | from .handlers import (LoginHandler, LogoutHandler, | |
50 | ProjectDashboardHandler, NewHandler, NamedNotebookHandler, |
|
68 | ProjectDashboardHandler, NewHandler, NamedNotebookHandler, | |
@@ -98,9 +116,6 b' ipython notebook --certfile=mycert.pem # use SSL/TLS certificate' | |||||
98 | ipython notebook --port=5555 --ip=* # Listen on port 5555, all interfaces |
|
116 | ipython notebook --port=5555 --ip=* # Listen on port 5555, all interfaces | |
99 | """ |
|
117 | """ | |
100 |
|
118 | |||
101 | # Packagers: modify this line if you store the notebook static files elsewhere |
|
|||
102 | DEFAULT_STATIC_FILES_PATH = os.path.join(os.path.dirname(__file__), "static") |
|
|||
103 |
|
||||
104 | #----------------------------------------------------------------------------- |
|
119 | #----------------------------------------------------------------------------- | |
105 | # Helper functions |
|
120 | # Helper functions | |
106 | #----------------------------------------------------------------------------- |
|
121 | #----------------------------------------------------------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now