From 6240d36a5b854b87319c5ddef89438da97c12614 Mon Sep 17 00:00:00 2001 From: rpmbuild Date: Thu, 26 Oct 2023 02:27:09 +0200 Subject: [PATCH] include the defusedxml match proposed for the upstream --- xlrd2/xlsx.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xlrd2/xlsx.py b/xlrd2/xlsx.py index 58fa02f..bea4213 100644 --- a/xlrd2/xlsx.py +++ b/xlrd2/xlsx.py @@ -36,7 +36,10 @@ def ensure_elementtree_imported(verbosity, logfile): #### 2.7.2.1: fails later with #### NotImplementedError: iterparse is not supported on IronPython. (CP #31923) else: - try: import defusedxml.cElementTree as ET + is_defused_xml = False + try: + import defusedxml.cElementTree as ET + is_defused_xml = True except ImportError: try: import xml.etree.cElementTree as ET except ImportError: @@ -56,7 +59,7 @@ def ensure_elementtree_imported(verbosity, logfile): ET_has_iterparse = True except NotImplementedError: pass - Element_has_iter = hasattr(ET, 'ElementTree') and hasattr(ET.ElementTree, 'iter') + Element_has_iter = is_defused_xml or (hasattr(ET, 'ElementTree') and hasattr(ET.ElementTree, 'iter')) if verbosity: etree_version = repr([ (item, getattr(ET, item))