From 7fe80dc12a0d51c8463256c267d7dad5573b10e3 Mon Sep 17 00:00:00 2001 From: Manjusaka Date: Sun, 17 Feb 2019 10:06:55 +0800 Subject: [PATCH 1/2] bpo-28235: fix *xml.etree.ElementTree.fromstring* docs --- Doc/library/xml.etree.elementtree.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst index aae80140374cc1..6705c7bf046a85 100644 --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -494,10 +494,12 @@ Functions by the user. -.. function:: fromstring(text) +.. function:: fromstring(text, parser=None) Parses an XML section from a string constant. Same as :func:`XML`. *text* - is a string containing XML data. Returns an :class:`Element` instance. + is a string containing XML data. *parser* is an optional parser instance. + If not given, the standard :class:`XMLParser` parser is used. + Returns an :class:`Element` instance. .. function:: fromstringlist(sequence, parser=None) From b0b545a957b73025df4d11e814d202364a2e738b Mon Sep 17 00:00:00 2001 From: Manjusaka Date: Sun, 17 Feb 2019 10:21:50 +0800 Subject: [PATCH 2/2] fix CI error --- Doc/library/xml.etree.elementtree.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst index 6705c7bf046a85..4a7cf6f095885e 100644 --- a/Doc/library/xml.etree.elementtree.rst +++ b/Doc/library/xml.etree.elementtree.rst @@ -497,8 +497,8 @@ Functions .. function:: fromstring(text, parser=None) Parses an XML section from a string constant. Same as :func:`XML`. *text* - is a string containing XML data. *parser* is an optional parser instance. - If not given, the standard :class:`XMLParser` parser is used. + is a string containing XML data. *parser* is an optional parser instance. + If not given, the standard :class:`XMLParser` parser is used. Returns an :class:`Element` instance.