Refactoring

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,
+from radicale import (auth, hook, httputils, log, pathutils, rights, storage, web,
-                      xmlutils, hook)
+                      xmlutils)
 from radicale.app.delete import ApplicationDeleteMixin
 from radicale.app.get import ApplicationGetMixin
 from radicale.app.head import ApplicationHeadMixin

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()}
 

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",

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")
 

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):