-
-
Notifications
You must be signed in to change notification settings - Fork 32.2k
gh-135640: Adds type checking to ElementTree.ElementTree constructor #135643
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.
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
abstractedfox
wants to merge
5
commits into
python:main
Choose a base branch
from
abstractedfox:elementtree-fix
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
b0a8a64
Tenuous first fix
abstractedfox f0356c8
Remove commented assertions
abstractedfox 06eaff5
Add tests for ElementTree constructor
abstractedfox 6d4d65f
Add appropriate text to an exception
abstractedfox 84b22d4
Make iselement stricter + incorporate feedback
abstractedfox File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -120,8 +120,9 @@ class ParseError(SyntaxError): | |
|
||
def iselement(element): | ||
"""Return True if *element* appears to be an Element.""" | ||
return hasattr(element, 'tag') | ||
|
||
return (hasattr(element, 'tag') and hasattr(element, 'text') and | ||
hasattr(element, 'tail') and callable(element.iter) and | ||
callable(element.items) and callable(element.__len__)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this function raise an exception if iter(), items() or |
||
|
||
class Element: | ||
"""An XML element. | ||
|
@@ -527,7 +528,9 @@ class ElementTree: | |
|
||
""" | ||
def __init__(self, element=None, file=None): | ||
# assert element is None or iselement(element) | ||
if element is not None and not iselement(element): | ||
raise TypeError(f"element must be xml.etree.Element, " | ||
f"not {type(element).__name__}") | ||
self._root = element # first node | ||
if file: | ||
self.parse(file) | ||
|
@@ -543,7 +546,9 @@ def _setroot(self, element): | |
with the given element. Use with care! | ||
|
||
""" | ||
# assert iselement(element) | ||
if not iselement(element): | ||
raise TypeError(f"element must be xml.etree.Element, " | ||
f"not {type(element).__name__}") | ||
self._root = element | ||
|
||
def parse(self, source, parser=None): | ||
|
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/Library/2025-06-22-02-16-17.gh-issue-135640.FXyFL6.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
Address bug where calling :func:`xml.etree.ElementTree.ElementTree.write` on | ||
an ElementTree object with an invalid root element would blank the file | ||
passed to ``write`` if it already existed. |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe test also _setroot() here?