From 18ed68f33e9da83670ad90881cb4fed35a0f150d Mon Sep 17 00:00:00 2001 From: Zsailer Date: Thu, 3 Sep 2020 09:52:55 -0700 Subject: [PATCH] fallback to default logger in handlers if no logger is provided; provide fallback for templates --- jupyter_server/extension/handler.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jupyter_server/extension/handler.py b/jupyter_server/extension/handler.py index 454ca63696..58ff60c3ed 100644 --- a/jupyter_server/extension/handler.py +++ b/jupyter_server/extension/handler.py @@ -1,5 +1,6 @@ from urllib.parse import urljoin from jupyter_server.base.handlers import FileFindHandler +from jinja2.exceptions import TemplateNotFound class ExtensionHandlerJinjaMixin: @@ -8,8 +9,11 @@ class ExtensionHandlerJinjaMixin: """ def get_template(self, name): """Return the jinja template object for a given name""" - env = '{}_jinja2_env'.format(self.name) - return self.settings[env].get_template(name) + try: + env = '{}_jinja2_env'.format(self.name) + return self.settings[env].get_template(name) + except TemplateNotFound: + return super().get_template(name) class ExtensionHandlerMixin: @@ -36,6 +40,8 @@ def serverapp(self): @property def log(self): + if not hasattr(self, 'name'): + return super().log # Attempt to pull the ExtensionApp's log, otherwise fall back to ServerApp. try: return self.extensionapp.log