diff options
| author | Christian Heimes <christian@python.org> | 2019-04-14 12:12:48 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2019-04-14 12:13:48 +0200 |
| commit | 4ecaeda4d95abbec74de65728271e11b8ca3cda6 (patch) | |
| tree | 486ed9ccefeefe210d6eb9ecfe9bf59be7e66630 | |
| parent | 34d0a1b58fa963b965cf98ff2970b3df54189ec3 (diff) | |
| download | defusedxml-git-4ecaeda4d95abbec74de65728271e11b8ca3cda6.tar.gz | |
Fix XMLParse typo
The defusedxml.ElementTree and defusedxml.cElementTree modules had a typo
and used XMLParse instead of XMLParser as an alias for DefusedXMLParser.
Both the old and fixed name are now available.
Signed-off-by: Christian Heimes <christian@python.org>
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | defusedxml/ElementTree.py | 7 | ||||
| -rw-r--r-- | defusedxml/cElementTree.py | 7 | ||||
| -rw-r--r-- | tests.py | 6 |
4 files changed, 17 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index a3175e8..7845644 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -15,6 +15,9 @@ defusedxml 0.6.0.dev1 - defusedxml now fails early when pyexpat stdlib module is not available or broken. - defusedxml.ElementTree.__all__ now lists ParseError as public attribute. +- The defusedxml.ElementTree and defusedxml.cElementTree modules had a typo + and used XMLParse instead of XMLParser as an alias for DefusedXMLParser. + Both the old and fixed name are now available. defusedxml 0.5.0 diff --git a/defusedxml/ElementTree.py b/defusedxml/ElementTree.py index 991a54d..80da8b4 100644 --- a/defusedxml/ElementTree.py +++ b/defusedxml/ElementTree.py @@ -114,7 +114,8 @@ class DefusedXMLParser(_XMLParser): # aliases -XMLTreeBuilder = XMLParse = DefusedXMLParser +# XMLParse is a typo, keep it for backwards compatibility +XMLTreeBuilder = XMLParse = XMLParser = DefusedXMLParser parse, iterparse, fromstring = _generate_etree_functions(DefusedXMLParser, _TreeBuilder, _parse, @@ -123,6 +124,6 @@ XML = fromstring __all__ = [ - 'ParseError', 'XML', 'XMLParse', 'XMLTreeBuilder', 'fromstring', - 'iterparse', 'parse', 'tostring' + 'ParseError', 'XML', 'XMLParse', 'XMLParser', 'XMLTreeBuilder', + 'fromstring', 'iterparse', 'parse', 'tostring' ] diff --git a/defusedxml/cElementTree.py b/defusedxml/cElementTree.py index 0c1baf8..61cb38f 100644 --- a/defusedxml/cElementTree.py +++ b/defusedxml/cElementTree.py @@ -19,12 +19,13 @@ from .common import _generate_etree_functions __origin__ = "xml.etree.cElementTree" -XMLTreeBuilder = XMLParse = DefusedXMLParser +# XMLParse is a typo, keep it for backwards compatibility +XMLTreeBuilder = XMLParse = XMLParser = DefusedXMLParser parse, iterparse, fromstring = _generate_etree_functions(DefusedXMLParser, _TreeBuilder, _parse, _iterparse) XML = fromstring -__all__ = ['XML', 'XMLParse', 'XMLTreeBuilder', 'fromstring', 'iterparse', - 'parse', 'tostring'] +__all__ = ['XML', 'XMLParse', 'XMLParser', 'XMLTreeBuilder', 'fromstring', + 'iterparse', 'parse', 'tostring'] @@ -200,6 +200,12 @@ class TestDefusedElementTree(BaseTests): with self.assertRaises(TypeError): ElementTree.XMLParse(html=1) + def test_aliases(self): + parser = self.module.DefusedXMLParser + assert self.module.XMLTreeBuilder is parser + assert self.module.XMLParser is parser + assert self.module.XMLParse is parser + class TestDefusedcElementTree(TestDefusedElementTree): module = cElementTree |