diff options
author | mathieui <mathieui@mathieui.net> | 2020-04-04 17:55:11 +0200 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2020-04-04 17:55:11 +0200 |
commit | 98108d0445575c2de5701accaab3afabd9f6c500 (patch) | |
tree | 811490670b3fd429b25b2615e475dcf5edb71a48 | |
parent | 76f4fb49d6ad44ccafb97748183ce04986f82cda (diff) | |
parent | 7218bb44997b8b3cc5bed114f6bfc668d1e7d913 (diff) | |
download | slixmpp-98108d0445575c2de5701accaab3afabd9f6c500.tar.gz slixmpp-98108d0445575c2de5701accaab3afabd9f6c500.tar.bz2 slixmpp-98108d0445575c2de5701accaab3afabd9f6c500.tar.xz slixmpp-98108d0445575c2de5701accaab3afabd9f6c500.zip |
Merge branch 'fix-celementtree-import' into 'master'
cElementTree has been deprecated since Python 3.3 and removed in Python 3.9.
See merge request poezio/slixmpp!38
-rw-r--r-- | docs/api/xmlstream/tostring.rst | 2 | ||||
-rw-r--r-- | slixmpp/plugins/xep_0009/stanza/RPC.py | 2 | ||||
-rw-r--r-- | slixmpp/xmlstream/stanzabase.py | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/api/xmlstream/tostring.rst b/docs/api/xmlstream/tostring.rst index 68abbdb6..107e97b0 100644 --- a/docs/api/xmlstream/tostring.rst +++ b/docs/api/xmlstream/tostring.rst @@ -13,7 +13,7 @@ hides namespaces when able and does not introduce excessive namespace prefixes:: >>> from slixmpp.xmlstream.tostring import tostring - >>> from xml.etree import cElementTree as ET + >>> from xml.etree import ElementTree as ET >>> xml = ET.fromstring('<foo xmlns="bar"><baz /></foo>') >>> ET.tostring(xml) '<ns0:foo xmlns:ns0="bar"><ns0:baz /></foo>' diff --git a/slixmpp/plugins/xep_0009/stanza/RPC.py b/slixmpp/plugins/xep_0009/stanza/RPC.py index f8cec481..542c839c 100644 --- a/slixmpp/plugins/xep_0009/stanza/RPC.py +++ b/slixmpp/plugins/xep_0009/stanza/RPC.py @@ -7,7 +7,7 @@ """ from slixmpp.xmlstream.stanzabase import ElementBase -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET class RPCQuery(ElementBase): diff --git a/slixmpp/xmlstream/stanzabase.py b/slixmpp/xmlstream/stanzabase.py index 3e45f613..c3dbfb67 100644 --- a/slixmpp/xmlstream/stanzabase.py +++ b/slixmpp/xmlstream/stanzabase.py @@ -17,7 +17,7 @@ from __future__ import with_statement, unicode_literals import copy import logging import weakref -from xml.etree import cElementTree as ET +from xml.etree import ElementTree as ET from slixmpp.xmlstream import JID from slixmpp.xmlstream.tostring import tostring @@ -203,7 +203,7 @@ class ElementBase(object): """ The core of Slixmpp's stanza XML manipulation and handling is provided - by ElementBase. ElementBase wraps XML cElementTree objects and enables + by ElementBase. ElementBase wraps XML ElementTree objects and enables access to the XML contents through dictionary syntax, similar in style to the Ruby XMPP library Blather's stanza implementation. @@ -387,7 +387,7 @@ class ElementBase(object): self._index = 0 #: The underlying XML object for the stanza. It is a standard - #: :class:`xml.etree.cElementTree` object. + #: :class:`xml.etree.ElementTree` object. self.xml = xml #: An ordered dictionary of plugin stanzas, mapped by their |