diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-02-12 08:50:11 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-12 08:50:11 (GMT) |
commit | b7a65c939c93e7910abc8c9d4a129ff385714824 (patch) | |
tree | 88f9d3e9edc08e3ad99ed5545cafe290d69e861a | |
parent | f2fbfbe0ec57ec39b3099dae62571a48d5fe8729 (diff) | |
download | cpython-b7a65c939c93e7910abc8c9d4a129ff385714824.zip cpython-b7a65c939c93e7910abc8c9d4a129ff385714824.tar.gz cpython-b7a65c939c93e7910abc8c9d4a129ff385714824.tar.bz2 |
bpo-45948: Remove constructor discrepancy in C version of ElementTree.XMLParser (GH-31152)
Both implementations accept target=None now.
(cherry picked from commit 168fd6453b5de15236116f9261d64601d92571ac)
Co-authored-by: Jacob Walls <jacobtylerwalls@gmail.com>
-rw-r--r-- | Lib/test/test_xml_etree.py | 9 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2022-02-05-18-22-05.bpo-45948.w4mCnE.rst | 5 | ||||
-rw-r--r-- | Modules/_elementtree.c | 6 | ||||
-rw-r--r-- | Modules/clinic/_elementtree.c.h | 4 |
4 files changed, 19 insertions, 5 deletions
diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 285559a..a25f536 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -758,6 +758,15 @@ class ElementTreeTest(unittest.TestCase): ('end-ns', ''), ]) + def test_initialize_parser_without_target(self): + # Explicit None + parser = ET.XMLParser(target=None) + self.assertIsInstance(parser.target, ET.TreeBuilder) + + # Implicit None + parser2 = ET.XMLParser() + self.assertIsInstance(parser2.target, ET.TreeBuilder) + def test_children(self): # Test Element children iteration diff --git a/Misc/NEWS.d/next/Library/2022-02-05-18-22-05.bpo-45948.w4mCnE.rst b/Misc/NEWS.d/next/Library/2022-02-05-18-22-05.bpo-45948.w4mCnE.rst new file mode 100644 index 0000000..42dc114 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-02-05-18-22-05.bpo-45948.w4mCnE.rst @@ -0,0 +1,5 @@ +Fixed a discrepancy in the C implementation of the +:mod:`xml.etree.ElementTree` module. Now, instantiating an +:class:`xml.etree.ElementTree.XMLParser` with a ``target=None`` +keyword provides a default :class:`xml.etree.ElementTree.TreeBuilder` +target as the Python implementation does. diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 9dadeef..8637bae 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3636,7 +3636,7 @@ ignore_attribute_error(PyObject *value) _elementtree.XMLParser.__init__ * - target: object = NULL + target: object = None encoding: str(accept={str, NoneType}) = None [clinic start generated code]*/ @@ -3644,7 +3644,7 @@ _elementtree.XMLParser.__init__ static int _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target, const char *encoding) -/*[clinic end generated code: output=3ae45ec6cdf344e4 input=53e35a829ae043e8]*/ +/*[clinic end generated code: output=3ae45ec6cdf344e4 input=7e716dd6e4f3e439]*/ { self->entity = PyDict_New(); if (!self->entity) @@ -3669,7 +3669,7 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target, (unsigned long)_Py_HashSecret.expat.hashsalt); } - if (target) { + if (target != Py_None) { Py_INCREF(target); } else { target = treebuilder_new(&TreeBuilder_Type, NULL, NULL); diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h index 2c9ba47..5ed5a6c 100644 --- a/Modules/clinic/_elementtree.c.h +++ b/Modules/clinic/_elementtree.c.h @@ -807,7 +807,7 @@ _elementtree_XMLParser___init__(PyObject *self, PyObject *args, PyObject *kwargs PyObject * const *fastargs; Py_ssize_t nargs = PyTuple_GET_SIZE(args); Py_ssize_t noptargs = nargs + (kwargs ? PyDict_GET_SIZE(kwargs) : 0) - 0; - PyObject *target = NULL; + PyObject *target = Py_None; const char *encoding = NULL; fastargs = _PyArg_UnpackKeywords(_PyTuple_CAST(args)->ob_item, nargs, kwargs, NULL, &_parser, 0, 0, 0, argsbuf); @@ -915,4 +915,4 @@ skip_optional: exit: return return_value; } -/*[clinic end generated code: output=1385b5e5688f3614 input=a9049054013a1b77]*/ +/*[clinic end generated code: output=992733cfc7390590 input=a9049054013a1b77]*/ |