Skip to content

Fix #15163 (CI: addon tests fail with Python 3.15 due to unclosed iterparse iterator in cppcheckdata.py) #8984

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

Merged
danmar merged 2 commits into from
Oct 31, 2026
Merged

Fix #15163 (CI: addon tests fail with Python 3.15 due to unclosed iterparse iterator in cppcheckdata.py) #8984

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c79148
Fix #15163 (CI: addon tests fail with Python 3.15 due to unclosed ite…
dmcppcheck Oct 31, 2026
0c120d2
pylint
dmcppcheck Oct 31, 2026
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
11 changes: 9 additions & 2 deletions addons/cppcheckdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@

current_dumpfile_suppressions = []

def _iterparse(filename, events):
# Open the file here so it is closed even when the caller stops iterating
# early. Python 3.15 warns about unclosed iterparse iterators otherwise.
with open(filename, 'rb') as f:
yield from ElementTree.iterparse(f, events=events)


def _load_location(location, element):
"""Load location from element/dict"""
location.file = element.get('file')
Expand Down Expand Up @@ -1237,7 +1244,7 @@ def __init__(self, filename):
# Parse general configuration options from <dumps> node
# We intentionally don't clean node resources here because we
# want to serialize in memory only small part of the XML tree.
for event, node in ElementTree.iterparse(self.filename, events=('start', 'end')):
for event, node in _iterparse(self.filename, events=('start', 'end')):
if platform_done and rawtokens_done and suppressions_done:
break
if node.tag == 'dumps':
Expand Down Expand Up @@ -1296,7 +1303,7 @@ def iterconfigurations(self):
# Use iterable objects to traverse XML tree for dump files incrementally.
# Iterative approach is required to avoid large memory consumption.
# Calling .clear() is necessary to let the element be garbage collected.
for event, node in ElementTree.iterparse(self.filename, events=('start', 'end')):
for event, node in _iterparse(self.filename, events=('start', 'end')):
# Serialize new configuration node
if node.tag == 'dump':
if event == 'start':
Expand Down
Loading