Sort imports
This commit is contained in:
		@@ -1,3 +1,3 @@
 | 
				
			|||||||
[pytest]
 | 
					[pytest]
 | 
				
			||||||
addopts = --flake8 --isort --cov radicale radicale
 | 
					addopts = --flake8 --isort --cov radicale/ tests
 | 
				
			||||||
norecursedirs = dist .cache .git build *.egg-info .eggs venv
 | 
					norecursedirs = dist .cache .git build *.egg-info .eggs venv
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,18 +23,17 @@ from a python programme with ``radicale.__main__.run()``.
 | 
				
			|||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import atexit
 | 
					import atexit
 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
import sys
 | 
					 | 
				
			||||||
import optparse
 | 
					import optparse
 | 
				
			||||||
 | 
					import os
 | 
				
			||||||
import select
 | 
					import select
 | 
				
			||||||
import signal
 | 
					import signal
 | 
				
			||||||
import socket
 | 
					import socket
 | 
				
			||||||
import ssl
 | 
					import ssl
 | 
				
			||||||
 | 
					import sys
 | 
				
			||||||
from wsgiref.simple_server import make_server
 | 
					from wsgiref.simple_server import make_server
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from . import (
 | 
					from . import (VERSION, Application, RequestHandler, ThreadedHTTPServer,
 | 
				
			||||||
    Application, config, ThreadedHTTPServer, ThreadedHTTPSServer, log,
 | 
					               ThreadedHTTPSServer, config, log)
 | 
				
			||||||
    RequestHandler, VERSION)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# This is a script, many branches and variables
 | 
					# This is a script, many branches and variables
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -53,8 +53,8 @@ following significantly more secure schemes are parsable by Radicale:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import functools
 | 
					 | 
				
			||||||
import base64
 | 
					import base64
 | 
				
			||||||
 | 
					import functools
 | 
				
			||||||
import hashlib
 | 
					import hashlib
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
from importlib import import_module
 | 
					from importlib import import_module
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -24,10 +24,8 @@ Give a configparser-like interface to read and write configuration.
 | 
				
			|||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
 | 
					 | 
				
			||||||
from configparser import RawConfigParser as ConfigParser
 | 
					from configparser import RawConfigParser as ConfigParser
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
# Default configuration
 | 
					# Default configuration
 | 
				
			||||||
INITIAL_CONFIG = {
 | 
					INITIAL_CONFIG = {
 | 
				
			||||||
    "server": {
 | 
					    "server": {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,11 +22,11 @@ http://docs.python.org/library/logging.config.html
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
import sys
 | 
					 | 
				
			||||||
import logging
 | 
					import logging
 | 
				
			||||||
import logging.config
 | 
					import logging.config
 | 
				
			||||||
 | 
					import os
 | 
				
			||||||
import signal
 | 
					import signal
 | 
				
			||||||
 | 
					import sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def configure_from_file(filename, debug, logger):
 | 
					def configure_from_file(filename, debug, logger):
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,8 +40,8 @@ Leading or ending slashes are trimmed from collection's path.
 | 
				
			|||||||
import os.path
 | 
					import os.path
 | 
				
			||||||
import re
 | 
					import re
 | 
				
			||||||
from configparser import ConfigParser
 | 
					from configparser import ConfigParser
 | 
				
			||||||
from io import StringIO
 | 
					 | 
				
			||||||
from importlib import import_module
 | 
					from importlib import import_module
 | 
				
			||||||
 | 
					from io import StringIO
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def load(configuration, logger):
 | 
					def load(configuration, logger):
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,7 +36,6 @@ import vobject
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
from . import client, storage
 | 
					from . import client, storage
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
NAMESPACES = {
 | 
					NAMESPACES = {
 | 
				
			||||||
    "C": "urn:ietf:params:xml:ns:caldav",
 | 
					    "C": "urn:ietf:params:xml:ns:caldav",
 | 
				
			||||||
    "CR": "urn:ietf:params:xml:ns:carddav",
 | 
					    "CR": "urn:ietf:params:xml:ns:carddav",
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user