@@ -33,9 +33,9 @@ import posixpath
import pprint
import random
import time
+import xml.etree.ElementTree as ET
import zlib
from http import client
-from xml.etree import ElementTree as ET
import defusedxml.ElementTree as DefusedET
import pkg_resources
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU General Public License
# along with Radicale. If not, see <http://www.gnu.org/licenses/>.
from radicale import app, httputils, storage, xmlutils
@@ -21,8 +21,8 @@ import collections
import itertools
import posixpath
import socket
from radicale import app, httputils, pathutils, rights, storage, xmlutils
from radicale.log import logger
@@ -19,8 +19,8 @@
import contextlib
from radicale import app, httputils
from radicale import item as radicale_item
@@ -20,9 +20,9 @@
from urllib.parse import unquote, urlparse
from radicale import app, httputils, pathutils, storage, xmlutils
from radicale.item import filter as radicale_filter