From d21caf39ab506b95c92f8445a94859c15af809e7 2013-07-18 00:45:52 From: Jonathan Frederic Date: 2013-07-18 00:45:52 Subject: [PATCH] Fix failure on Py2.6 --- diff --git a/IPython/nbconvert/filters/strings.py b/IPython/nbconvert/filters/strings.py index c886804..fbe4f08 100755 --- a/IPython/nbconvert/filters/strings.py +++ b/IPython/nbconvert/filters/strings.py @@ -61,7 +61,11 @@ def html_text(element): Analog of jQuery's $(element).text() """ - if not isinstance(element, (ElementTree.ElementTree, ElementTree.Element)): + instance_element_tree = isinstance(ElementTree.ElementTree, Type) and + isinstance(element, (ElementTree.ElementTree)) + instance_element = isinstance(ElementTree.Element, Type) and + isinstance(element, (ElementTree.Element)) + if not (instance_element or instance_element_tree): element = ElementTree.fromstring(element) text = element.text or ""