Skip to content
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

Jump to bottom

bpo-35052: Fix handler on xml.dom.minidom.cloneNode() #11061

Merged
merged 2 commits into from Dec 10, 2018
Merged

bpo-35052: Fix handler on xml.dom.minidom.cloneNode() #11061

merged 2 commits into from Dec 10, 2018

Conversation

vstinner
Copy link
Member

@vstinner vstinner commented Dec 10, 2018 •
edited by bedevere-bot

Fix xml.dom.minidom cloneNode() on a document with an entity: pass
the correct arguments to the user data handler of an entity (fix an
old copy/paste mistake).

Bug spotted and fix proposed by Charalampos Stratakis, initial
reproducer written by Petr Viktorin.

Co-Authored-By: Charalampos Stratakis cstratak@redhat.com
Co-Authored-By: Petr Viktorin encukou@gmail.com

https://bugs.python.org/issue35052

@vstinner @stratakis @encukou
bpo-35052: Fix handler on xml.dom.minidom.cloneNode()
633c325 
Fix xml.dom.minidom cloneNode() on a document with an entity: pass
the correct arguments to the user data handler of an entity (fix an
old copy/paste mistake).

Bug spotted and fix proposed by Charalampos Stratakis, initial
reproducer written by Petr Viktorin.

Co-Authored-By: Charalampos Stratakis <cstratak@redhat.com>
Co-Authored-By: Petr Viktorin <encukou@gmail.com>
@vstinner
Copy link
Member Author

vstinner commented Dec 10, 2018

cc @stratakis @encukou

@taleinat
Copy link
Contributor

taleinat commented Dec 10, 2018 •
edited

@vstinner, did you see that this same copy/paste error appears twice in that file? ISTM we should fix both instances.

See the other instance here.

@vstinner
Copy link
Member Author

vstinner commented Dec 10, 2018

@vstinner, did you see that this same copy/paste error appears twice in that file? ISTM we should fix both instances. See the other instance here.

No, I didn't. I should now be fixed as well.

taleinat
taleinat approved these changes Dec 10, 2018
View changes
Copy link
Contributor

@taleinat taleinat left a comment

LGTM, though I'm far from an expert on XML.

@vstinner
Copy link
Member Author

vstinner commented Dec 10, 2018

LGTM, though I'm far from an expert on XML.

I'm not an expert neither. There is no more xml.dom.minidom expert: https://devguide.python.org/experts/

Since I wrote a complete test, I'm now confident in my fix.

@vstinner vstinner merged commit 8e04186 into python:master Dec 10, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Dec 10, 2018

Thanks @vstinner for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@vstinner vstinner deleted the minidom_entity_handler branch Dec 10, 2018
@miss-islington
Copy link
Contributor

miss-islington commented Dec 10, 2018

Sorry, @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8e0418688906206fe59bd26344320c0fc026849e 3.7

@miss-islington
Copy link
Contributor

miss-islington commented Dec 10, 2018

Sorry, @vstinner, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8e0418688906206fe59bd26344320c0fc026849e 3.6

@miss-islington
Copy link
Contributor

miss-islington commented Dec 10, 2018

Sorry, @vstinner, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 8e0418688906206fe59bd26344320c0fc026849e 2.7

@bedevere-bot
Copy link

bedevere-bot commented Dec 10, 2018

GH-11066 is a backport of this pull request to the 3.7 branch.

@bedevere-bot
Copy link

bedevere-bot commented Dec 10, 2018

GH-11067 is a backport of this pull request to the 3.6 branch.

@bedevere-bot
Copy link

bedevere-bot commented Dec 10, 2018

GH-11068 is a backport of this pull request to the 2.7 branch.

vstinner added a commit that referenced this pull request Dec 10, 2018
@vstinner
bpo-35052: Fix handler on xml.dom.minidom.cloneNode() (GH-11061) (GH-…
3fd9755 
…11067)

Fix xml.dom.minidom cloneNode() on a document with an entity: pass
the correct arguments to the user data handler of an entity (fix an
old copy/paste mistake).

Bug spotted and fix proposed by Charalampos Stratakis, initial
reproducer written by Petr Viktorin.

Co-Authored-By: Charalampos Stratakis <cstratak@redhat.com>
Co-Authored-By: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit 8e04186)
vstinner added a commit that referenced this pull request Dec 10, 2018
@vstinner
bpo-35052: Fix handler on xml.dom.minidom.cloneNode() (GH-11061) (GH-…
c3cc751 
…11066)

Fix xml.dom.minidom cloneNode() on a document with an entity: pass
the correct arguments to the user data handler of an entity (fix an
old copy/paste mistake).

Bug spotted and fix proposed by Charalampos Stratakis, initial
reproducer written by Petr Viktorin.

Co-Authored-By: Charalampos Stratakis <cstratak@redhat.com>
Co-Authored-By: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit 8e04186)
vstinner added a commit that referenced this pull request Dec 10, 2018
@vstinner
bpo-35052: Fix handler on xml.dom.minidom.cloneNode() (GH-11061) (GH-…
cecf313 
…11068)

Fix xml.dom.minidom cloneNode() on a document with an entity: pass
the correct arguments to the user data handler of an entity (fix an
old copy/paste mistake).

Bug spotted and fix proposed by Charalampos Stratakis, initial
reproducer written by Petr Viktorin.

Co-Authored-By: Charalampos Stratakis <cstratak@redhat.com>
Co-Authored-By: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit 8e04186)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taleinat taleinat

Assignees

@vstinner vstinner

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@vstinner @taleinat @miss-islington @bedevere-bot @the-knights-who-say-ni