bpo-29209: Remove old-deprecated features in ElementTree. (GH-6769)
Also make getchildren() and getiterator() emitting
a DeprecationWarning instead of PendingDeprecationWarning.
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 1dfdb3c..1500a6d 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1429,8 +1429,7 @@
_elementtree_Element_getiterator_impl(ElementObject *self, PyObject *tag)
/*[clinic end generated code: output=cb69ff4a3742dfa1 input=500da1a03f7b9e28]*/
{
- /* Change for a DeprecationWarning in 1.4 */
- if (PyErr_WarnEx(PyExc_PendingDeprecationWarning,
+ if (PyErr_WarnEx(PyExc_DeprecationWarning,
"This method will be removed in future versions. "
"Use 'tree.iter()' or 'list(tree.iter())' instead.",
1) < 0) {
@@ -2770,12 +2769,6 @@
} XMLParserObject;
-static PyObject*
-_elementtree_XMLParser_doctype(XMLParserObject *self, PyObject *const *args, Py_ssize_t nargs);
-static PyObject *
-_elementtree_XMLParser_doctype_impl(XMLParserObject *self, PyObject *name,
- PyObject *pubid, PyObject *system);
-
/* helpers */
LOCAL(PyObject*)
@@ -3139,10 +3132,9 @@
const XML_Char *pubid,
int has_internal_subset)
{
- PyObject *self_pyobj = (PyObject *)self;
+ _Py_IDENTIFIER(doctype);
PyObject *doctype_name_obj, *sysid_obj, *pubid_obj;
- PyObject *parser_doctype = NULL;
- PyObject *res = NULL;
+ PyObject *res;
if (PyErr_Occurred())
return;
@@ -3179,33 +3171,15 @@
res = PyObject_CallFunctionObjArgs(self->handle_doctype,
doctype_name_obj, pubid_obj,
sysid_obj, NULL);
- Py_CLEAR(res);
+ Py_XDECREF(res);
}
- else {
- /* Now see if the parser itself has a doctype method. If yes and it's
- * a custom method, call it but warn about deprecation. If it's only
- * the vanilla XMLParser method, do nothing.
- */
- parser_doctype = PyObject_GetAttrString(self_pyobj, "doctype");
- if (parser_doctype &&
- !(PyCFunction_Check(parser_doctype) &&
- PyCFunction_GET_SELF(parser_doctype) == self_pyobj &&
- PyCFunction_GET_FUNCTION(parser_doctype) ==
- (PyCFunction) _elementtree_XMLParser_doctype)) {
- res = _elementtree_XMLParser_doctype_impl(self, doctype_name_obj,
- pubid_obj, sysid_obj);
- if (!res)
- goto clear;
- Py_DECREF(res);
- res = PyObject_CallFunctionObjArgs(parser_doctype,
- doctype_name_obj, pubid_obj,
- sysid_obj, NULL);
- Py_CLEAR(res);
- }
+ else if (_PyObject_LookupAttrId((PyObject *)self, &PyId_doctype, &res) > 0) {
+ (void)PyErr_WarnEx(PyExc_RuntimeWarning,
+ "The doctype() method of XMLParser is ignored. "
+ "Define doctype() method on the TreeBuilder target.",
+ 1);
}
-clear:
- Py_XDECREF(parser_doctype);
Py_DECREF(doctype_name_obj);
Py_DECREF(pubid_obj);
Py_DECREF(sysid_obj);
@@ -3269,25 +3243,17 @@
/*[clinic input]
_elementtree.XMLParser.__init__
- html: object = NULL
+ *
target: object = NULL
encoding: str(accept={str, NoneType}) = NULL
[clinic start generated code]*/
static int
-_elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html,
- PyObject *target, const char *encoding)
-/*[clinic end generated code: output=d6a16c63dda54441 input=155bc5695baafffd]*/
+_elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *target,
+ const char *encoding)
+/*[clinic end generated code: output=3ae45ec6cdf344e4 input=96288fcba916cfce]*/
{
- if (html != NULL) {
- if (PyErr_WarnEx(PyExc_DeprecationWarning,
- "The html argument of XMLParser() is deprecated",
- 1) < 0) {
- return -1;
- }
- }
-
self->entity = PyDict_New();
if (!self->entity)
return -1;
@@ -3616,30 +3582,6 @@
}
/*[clinic input]
-_elementtree.XMLParser.doctype
-
- name: object
- pubid: object
- system: object
- /
-
-[clinic start generated code]*/
-
-static PyObject *
-_elementtree_XMLParser_doctype_impl(XMLParserObject *self, PyObject *name,
- PyObject *pubid, PyObject *system)
-/*[clinic end generated code: output=10fb50c2afded88d input=84050276cca045e1]*/
-{
- if (PyErr_WarnEx(PyExc_DeprecationWarning,
- "This method of XMLParser is deprecated. Define"
- " doctype() method on the TreeBuilder target.",
- 1) < 0) {
- return NULL;
- }
- Py_RETURN_NONE;
-}
-
-/*[clinic input]
_elementtree.XMLParser._setevents
events_queue: object
@@ -3923,7 +3865,6 @@
_ELEMENTTREE_XMLPARSER_CLOSE_METHODDEF
_ELEMENTTREE_XMLPARSER__PARSE_WHOLE_METHODDEF
_ELEMENTTREE_XMLPARSER__SETEVENTS_METHODDEF
- _ELEMENTTREE_XMLPARSER_DOCTYPE_METHODDEF
{NULL, NULL}
};