diff options
| author | Christian Heimes <christian@python.org> | 2021-01-12 19:58:03 +0100 |
|---|---|---|
| committer | Christian Heimes <christian@python.org> | 2021-03-04 11:26:20 +0100 |
| commit | 96cd3476b2b3e0e0c95357370392bf13b3e89f7d (patch) | |
| tree | b1ac0f2dae657a00e4635f77090af081a2ae59ca | |
| parent | 2be0182d145d086306435f30ab997711bb5b3fb1 (diff) | |
| download | defusedxml-git-96cd3476b2b3e0e0c95357370392bf13b3e89f7d.tar.gz | |
make cElementTree an alias for ElementTree
| -rw-r--r-- | CHANGES.txt | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | defusedxml/cElementTree.py | 34 |
3 files changed, 20 insertions, 22 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c6e5151..9f54433 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,11 @@ Changelog ========= -defusedxml 0.7.0.dev1 +defusedxml 0.8.0.dev1 --------------------- +- Drop support for Python 2.7, 3.4, and 3.5. + defusedxml 0.7.0 ---------------- @@ -716,7 +716,9 @@ See <https://www.python.org/psf/license> for licensing details. Injection](https://www.owasp.org/index.php/Testing_for_XML_Injection_\(OWASP-DV-008\)) # Changelog -## defusedxml 0.7.0.dev1 +## defusedxml 0.8.0.dev1 + + - Drop support for Python 2.7, 3.4, and 3.5. ## defusedxml 0.7.0 diff --git a/defusedxml/cElementTree.py b/defusedxml/cElementTree.py index 2b6364e..565ab66 100644 --- a/defusedxml/cElementTree.py +++ b/defusedxml/cElementTree.py @@ -5,20 +5,20 @@ # See https://www.python.org/psf/license for licensing details. """Defused xml.etree.cElementTree """ -from __future__ import absolute_import - import warnings -from .common import _generate_etree_functions - -from xml.etree.cElementTree import TreeBuilder as _TreeBuilder -from xml.etree.cElementTree import parse as _parse -from xml.etree.cElementTree import tostring - -# iterparse from ElementTree! -from xml.etree.ElementTree import iterparse as _iterparse - -from .ElementTree import DefusedXMLParser +# This module is an alias for ElementTree just like xml.etree.cElementTree +from .ElementTree import ( + XML, + XMLParse, + XMLParser, + XMLTreeBuilder, + fromstring, + iterparse, + parse, + tostring, + DefusedXMLParser, +) __origin__ = "xml.etree.cElementTree" @@ -29,14 +29,6 @@ warnings.warn( stacklevel=2, ) -# 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", @@ -46,4 +38,6 @@ __all__ = [ "iterparse", "parse", "tostring", + # backwards compatibility + "DefusedXMLParser", ] |