summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2020-03-30 19:11:00 +0200
committerMaxime Buquet <pep@bouah.net>2020-03-30 19:11:00 +0200
commit3f297195b0f7339aeb0df7d60b1eafb5933acc3a (patch)
treef74a0ba27edf99e0f8d4b60b51291bb180e69edc
parent1f014b6bfb4fac60a22a09949abb5a65d33759f7 (diff)
parent81e0ca6dca7527ec7641ae9ac68bb1e4be4b3b01 (diff)
downloadpoezio-3f297195b0f7339aeb0df7d60b1eafb5933acc3a.tar.gz
poezio-3f297195b0f7339aeb0df7d60b1eafb5933acc3a.tar.bz2
poezio-3f297195b0f7339aeb0df7d60b1eafb5933acc3a.tar.xz
poezio-3f297195b0f7339aeb0df7d60b1eafb5933acc3a.zip
Merge branch 'fix-xml' into 'master'
cElementTree has been deprecated since Python 3.3 and removed in Python 3.9. See merge request poezio/poezio!74
-rw-r--r--poezio/core/commands.py2
-rw-r--r--poezio/core/core.py2
-rw-r--r--poezio/multiuserchat.py2
-rw-r--r--poezio/tabs/basetabs.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index f3498ed9..b00cf24a 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -3,7 +3,7 @@ Global commands which are to be linked to the Core class
"""
import asyncio
-from xml.etree import cElementTree as ET
+from xml.etree import ElementTree as ET
from typing import List, Optional, Tuple
import logging
diff --git a/poezio/core/core.py b/poezio/core/core.py
index 6065f215..525d02a6 100644
--- a/poezio/core/core.py
+++ b/poezio/core/core.py
@@ -16,7 +16,7 @@ import time
import uuid
from collections import defaultdict
from typing import Callable, Dict, List, Optional, Set, Tuple, Type
-from xml.etree import cElementTree as ET
+from xml.etree import ElementTree as ET
from functools import partial
from slixmpp import JID, InvalidJID
diff --git a/poezio/multiuserchat.py b/poezio/multiuserchat.py
index 47244e3d..30c36a77 100644
--- a/poezio/multiuserchat.py
+++ b/poezio/multiuserchat.py
@@ -10,7 +10,7 @@ Add some facilities that are not available on the XEP_0045
slix plugin
"""
-from xml.etree import cElementTree as ET
+from xml.etree import ElementTree as ET
from poezio.common import safeJID
from slixmpp import JID
diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py
index 7749de6c..73db87f2 100644
--- a/poezio/tabs/basetabs.py
+++ b/poezio/tabs/basetabs.py
@@ -20,7 +20,7 @@ import asyncio
import time
from math import ceil, log10
from datetime import datetime
-from xml.etree import cElementTree as ET
+from xml.etree import ElementTree as ET
from typing import (
Any,
Callable,