diff --git a/radicale/app/__init__.py b/radicale/app/__init__.py index 21c48709..76300cc0 100644 --- a/radicale/app/__init__.py +++ b/radicale/app/__init__.py @@ -40,8 +40,8 @@ from xml.etree import ElementTree as ET import defusedxml.ElementTree as DefusedET import pkg_resources -from radicale import (auth, httputils, log, pathutils, rights, storage, web, - xmlutils, hook) +from radicale import (auth, hook, httputils, log, pathutils, rights, storage, web, + xmlutils) from radicale.app.delete import ApplicationDeleteMixin from radicale.app.get import ApplicationGetMixin from radicale.app.head import ApplicationHeadMixin diff --git a/radicale/app/put.py b/radicale/app/put.py index e97c0885..dcea4516 100644 --- a/radicale/app/put.py +++ b/radicale/app/put.py @@ -28,8 +28,8 @@ import vobject from radicale import app, httputils from radicale import item as radicale_item from radicale import pathutils, rights, storage, xmlutils -from radicale.log import logger from radicale.hook import HookNotificationItem, HookNotificationItemTypes +from radicale.log import logger MIMETYPE_TAGS = {value: key for key, value in xmlutils.MIMETYPES.items()} diff --git a/radicale/config.py b/radicale/config.py index 7f57560c..b5a758cc 100644 --- a/radicale/config.py +++ b/radicale/config.py @@ -32,7 +32,7 @@ import string from collections import OrderedDict from configparser import RawConfigParser -from radicale import auth, rights, storage, web, hook +from radicale import auth, hook, rights, storage, web DEFAULT_CONFIG_PATH = os.pathsep.join([ "?/etc/radicale/config", diff --git a/radicale/hook/__init__.py b/radicale/hook/__init__.py index 46956faa..a1aea80f 100644 --- a/radicale/hook/__init__.py +++ b/radicale/hook/__init__.py @@ -1,7 +1,7 @@ import json +from enum import Enum from radicale import utils -from enum import Enum INTERNAL_TYPES = ("none", "rabbitmq") diff --git a/radicale/hook/rabbitmq/__init__.py b/radicale/hook/rabbitmq/__init__.py index 9d24a65b..4953a33e 100644 --- a/radicale/hook/rabbitmq/__init__.py +++ b/radicale/hook/rabbitmq/__init__.py @@ -1,7 +1,7 @@ import pika -from radicale.hook import HookNotificationItem from radicale import hook +from radicale.hook import HookNotificationItem class Hook(hook.BaseHook):