Merge setup.cfg and pytest.ini, fix tests

This commit is contained in:
Guillaume Ayoub
2017-04-15 10:51:00 +02:00
parent 26d8214296
commit 864eb5931a
8 changed files with 26 additions and 24 deletions

View File

@ -28,6 +28,7 @@ should have been included in this package.
import base64
import contextlib
import datetime
import io
import itertools
import os
@ -41,7 +42,6 @@ import threading
import traceback
import wsgiref.simple_server
import zlib
import datetime
from http import client
from urllib.parse import unquote, urlparse
@ -49,7 +49,6 @@ import vobject
from . import auth, rights, storage, xmlutils
VERSION = "2.0.0rc0"
NOT_ALLOWED = (
@ -125,7 +124,8 @@ class HTTPServer(wsgiref.simple_server.WSGIServer):
self.logger.error("connection timeout")
else:
self.logger.error(
"An exception occurred during request:\n%s", traceback.format_exc())
"An exception occurred during request:\n%s",
traceback.format_exc())
class HTTPSServer(HTTPServer):