From a359fdaa19a75e47fcebfe9fc53279d3f661e414 Mon Sep 17 00:00:00 2001 From: Josh Barnes Date: Tue, 24 Oct 2017 00:02:12 +0100 Subject: [PATCH 1/2] move js_hightlight into nbconvert_support --- .../{nbextensions/htmltools => nbconvert_support}/js_highlight.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/jupyter_contrib_nbextensions/{nbextensions/htmltools => nbconvert_support}/js_highlight.py (100%) diff --git a/src/jupyter_contrib_nbextensions/nbextensions/htmltools/js_highlight.py b/src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py similarity index 100% rename from src/jupyter_contrib_nbextensions/nbextensions/htmltools/js_highlight.py rename to src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py From bc899af00425dbce9d7c6c8a6fdccbe08f0b615e Mon Sep 17 00:00:00 2001 From: Josh Barnes Date: Tue, 24 Oct 2017 00:08:00 +0100 Subject: [PATCH 2/2] [js_highlight.py] Specify except clause with ImportError --- .../nbconvert_support/js_highlight.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py b/src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py index 0368b95..68ebd95 100644 --- a/src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py +++ b/src/jupyter_contrib_nbextensions/nbconvert_support/js_highlight.py @@ -21,7 +21,7 @@ from traitlets import Unicode try: from html.parser import HTMLParser # py3 -except: +except ImportError: from HTMLParser import HTMLParser # py2