|
12 | 12 | from traitlets import default
|
13 | 13 | from traitlets import Dict
|
14 | 14 | from traitlets import HasTraits
|
15 |
| -from traitlets import Instance |
16 | 15 | from traitlets import List
|
17 | 16 | from traitlets import Unicode
|
18 | 17 | from traitlets.config import Config
|
@@ -104,7 +103,7 @@ def _prepare_templates(self):
|
104 | 103 | loader=FileSystemLoader(self.template_paths),
|
105 | 104 | extensions=["jinja2.ext.i18n"],
|
106 | 105 | autoescape=True,
|
107 |
| - **self.jinja2_options, |
| 106 | + **self.jinja2_options |
108 | 107 | )
|
109 | 108 |
|
110 | 109 | # Add the jinja2 environment for this extension to the tornado settings.
|
@@ -163,12 +162,6 @@ class method. This method can be set as a entry_point in
|
163 | 162 | def _default_open_browser(self):
|
164 | 163 | return self.serverapp.config["ServerApp"].get("open_browser", True)
|
165 | 164 |
|
166 |
| - @property |
167 |
| - def config_file_paths(self): |
168 |
| - """Look on the same path as our parent for config files""" |
169 |
| - # rely on parent serverapp, which should control all config loading |
170 |
| - return self.serverapp.config_file_paths |
171 |
| - |
172 | 165 | # The extension name used to name the jupyter config
|
173 | 166 | # file, jupyter_{name}_config.
|
174 | 167 | # This should also match the jupyter subcommand used to launch
|
@@ -207,21 +200,7 @@ def _default_url(self):
|
207 | 200 | ]
|
208 | 201 |
|
209 | 202 | # A ServerApp is not defined yet, but will be initialized below.
|
210 |
| - serverapp = Instance(ServerApp) |
211 |
| - |
212 |
| - @default("serverapp") |
213 |
| - def _default_serverapp(self): |
214 |
| - # load the current global instance, if any |
215 |
| - if ServerApp.initialized(): |
216 |
| - try: |
217 |
| - return ServerApp.instance() |
218 |
| - except Exception: |
219 |
| - # error retrieving instance, e.g. MultipleInstanceError |
220 |
| - pass |
221 |
| - |
222 |
| - # serverapp accessed before it was defined, |
223 |
| - # declare an empty one |
224 |
| - return ServerApp() |
| 203 | + serverapp = None |
225 | 204 |
|
226 | 205 | _log_formatter_cls = LogFormatter
|
227 | 206 |
|
|
0 commit comments