Skip to content

include the defusedxml match proposed for the upstream #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xambroz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

include the defusedxml match proposed for the upstream #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions xlrd2/xlsx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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))
Expand Down