Get python3 ./setup.py test to pass cleanly

~ B'ezrat Hashem ~

radicale/__init__.py

@@ -25,9 +25,9 @@ Can be used with an external WSGI server or the built-in server.
 """
 
 import os
-import pkg_resources
 import threading
 
+import pkg_resources
 
 from radicale import config, log
 from radicale.app import Application

radicale/app/__init__.py

@@ -28,7 +28,6 @@ import base64
 import datetime
 import io
 import logging
-import pkg_resources
 import pprint
 import random
 import time
@@ -36,8 +35,10 @@ import zlib
 from http import client
 from xml.etree import ElementTree as ET
 
-from radicale import (
-    auth, httputils, log, pathutils, rights, storage, web, xmlutils)
+import pkg_resources
+
+from radicale import (auth, 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

radicale/item/filter.py

@@ -373,7 +373,7 @@ def visit_time_ranges(vobject_item, child_name, range_fn, infinity_fn):
                     # Line 6
                     if range_fn(reference_date - SECOND,
                                 reference_date + SECOND, is_recurrence):
-                                return
+                        return
                 elif created is not None:
                     # Line 7
                     if range_fn(reference_date, DATETIME_MAX, is_recurrence):

radicale/storage/multifilesystem/__init__.py

@@ -24,8 +24,8 @@ from tempfile import NamedTemporaryFile
 
 from radicale import pathutils, storage
 from radicale.storage.multifilesystem.cache import CollectionCacheMixin
-from radicale.storage.multifilesystem.create_collection import (
-    CollectionCreateCollectionMixin)
+from radicale.storage.multifilesystem.create_collection import \
+    CollectionCreateCollectionMixin
 from radicale.storage.multifilesystem.delete import CollectionDeleteMixin
 from radicale.storage.multifilesystem.discover import CollectionDiscoverMixin
 from radicale.storage.multifilesystem.get import CollectionGetMixin

radicale/tests/__init__.py

@@ -22,12 +22,11 @@ Tests for Radicale.
 
 import logging
 import os
-import radicale
 import sys
 from io import BytesIO
 
+import radicale
 from pytest_cov import embed
-
 from radicale import server
 
 # Measure coverage of forked processes