diff --git a/setup.py b/setup.py index f4b2810..63f4161 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,8 @@ ''' import ast import re -from setuptools import setup, find_packages + +from setuptools import find_packages, setup _version_re = re.compile(r'__version__\s+=\s+(.*)') diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index d8147d3..55cda65 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -10,10 +10,11 @@ import random import pytest -from .. import assert_item_equals, SIMPLE_TEMPLATE import vdirsyncer.exceptions as exceptions from vdirsyncer.storage.base import Item -from vdirsyncer.utils.compat import text_type, iteritems +from vdirsyncer.utils.compat import iteritems, text_type + +from .. import SIMPLE_TEMPLATE, assert_item_equals class StorageTests(object): diff --git a/tests/storage/dav/servers/radicale/__init__.py b/tests/storage/dav/servers/radicale/__init__.py index 2fd1d54..9d2c029 100644 --- a/tests/storage/dav/servers/radicale/__init__.py +++ b/tests/storage/dav/servers/radicale/__init__.py @@ -4,6 +4,7 @@ import os import sys import pytest + import wsgi_intercept import wsgi_intercept.requests_intercept diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py index 24acae4..dcc94c4 100644 --- a/tests/storage/dav/test_main.py +++ b/tests/storage/dav/test_main.py @@ -16,12 +16,14 @@ import pytest import requests import requests.exceptions -from .. import StorageTests -from tests import VCARD_TEMPLATE, TASK_TEMPLATE, EVENT_TEMPLATE +from tests import EVENT_TEMPLATE, TASK_TEMPLATE, VCARD_TEMPLATE + import vdirsyncer.exceptions as exceptions from vdirsyncer.storage.base import Item from vdirsyncer.storage.dav import CaldavStorage, CarddavStorage +from .. import StorageTests + dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale' diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py index 5cf4497..8921522 100644 --- a/tests/storage/test_filesystem.py +++ b/tests/storage/test_filesystem.py @@ -12,9 +12,10 @@ import os import pytest -from . import StorageTests from vdirsyncer.storage.filesystem import FilesystemStorage +from . import StorageTests + class TestFilesystemStorage(StorageTests): storage_class = FilesystemStorage diff --git a/tests/storage/test_http.py b/tests/storage/test_http.py index 845258b..90fa320 100644 --- a/tests/storage/test_http.py +++ b/tests/storage/test_http.py @@ -12,6 +12,7 @@ import pytest from requests import Response from tests import normalize_item + from vdirsyncer.storage.http import HttpStorage diff --git a/tests/storage/test_memory.py b/tests/storage/test_memory.py index d5ec586..19cab24 100644 --- a/tests/storage/test_memory.py +++ b/tests/storage/test_memory.py @@ -8,9 +8,10 @@ :license: MIT, see LICENSE for more details. ''' -from . import StorageTests from vdirsyncer.storage.memory import MemoryStorage +from . import StorageTests + class TestMemoryStorage(StorageTests): diff --git a/tests/storage/test_singlefile.py b/tests/storage/test_singlefile.py index 5ec1dab..51744e5 100644 --- a/tests/storage/test_singlefile.py +++ b/tests/storage/test_singlefile.py @@ -9,10 +9,11 @@ import pytest -from .. import assert_item_equals, EVENT_TEMPLATE -from . import StorageTests from vdirsyncer.storage.singlefile import SingleFileStorage +from . import StorageTests +from .. import EVENT_TEMPLATE, assert_item_equals + class TestSingleFileStorage(StorageTests): diff --git a/tests/test_sync.py b/tests/test_sync.py index df41ccc..8aab195 100644 --- a/tests/test_sync.py +++ b/tests/test_sync.py @@ -9,10 +9,11 @@ import pytest -from . import assert_item_equals, normalize_item from vdirsyncer.storage.base import Item from vdirsyncer.storage.memory import MemoryStorage -from vdirsyncer.sync import sync, SyncConflict, StorageEmpty, BothReadOnly +from vdirsyncer.sync import BothReadOnly, StorageEmpty, SyncConflict, sync + +from . import assert_item_equals, normalize_item def empty_storage(x): diff --git a/tests/utils/test_vobject.py b/tests/utils/test_vobject.py index 9c171ee..93ab063 100644 --- a/tests/utils/test_vobject.py +++ b/tests/utils/test_vobject.py @@ -9,8 +9,8 @@ import vdirsyncer.utils.vobject as vobject -from .. import normalize_item, VCARD_TEMPLATE, BARE_EVENT_TEMPLATE, \ - EVENT_TEMPLATE +from .. import BARE_EVENT_TEMPLATE, EVENT_TEMPLATE, VCARD_TEMPLATE, \ + normalize_item _simple_split = [ VCARD_TEMPLATE.format(r=123), diff --git a/vdirsyncer/cli.py b/vdirsyncer/cli.py index 855eef8..578be7f 100644 --- a/vdirsyncer/cli.py +++ b/vdirsyncer/cli.py @@ -13,11 +13,10 @@ import sys import argvard +from . import log from .storage import storage_names -from .sync import sync, StorageEmpty, SyncConflict -from .utils import expand_path, parse_options, split_dict, get_class_init_args - -import vdirsyncer.log as log +from .sync import StorageEmpty, SyncConflict, sync +from .utils import expand_path, get_class_init_args, parse_options, split_dict try: diff --git a/vdirsyncer/storage/__init__.py b/vdirsyncer/storage/__init__.py index 8fa26ca..672a5dd 100644 --- a/vdirsyncer/storage/__init__.py +++ b/vdirsyncer/storage/__init__.py @@ -12,7 +12,7 @@ :license: MIT, see LICENSE for more details. ''' -from .dav import CarddavStorage, CaldavStorage +from .dav import CaldavStorage, CarddavStorage from .filesystem import FilesystemStorage from .http import HttpStorage from .singlefile import SingleFileStorage diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 5ecab8c..27cc9e0 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -12,10 +12,9 @@ from lxml import etree from requests import session as requests_session -from .base import Item, Storage -from .http import prepare_auth, prepare_verify, USERAGENT - from .. import exceptions, log, utils +from .base import Item, Storage +from .http import USERAGENT, prepare_auth, prepare_verify dav_logger = log.get(__name__) diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py index 6f1c093..84db39f 100644 --- a/vdirsyncer/storage/filesystem.py +++ b/vdirsyncer/storage/filesystem.py @@ -9,10 +9,9 @@ import os +from .. import exceptions, log from .base import Item, Storage -import vdirsyncer.exceptions as exceptions -import vdirsyncer.log as log -from ..utils import expand_path, safe_write, get_etag_from_file, checkdir +from ..utils import checkdir, expand_path, get_etag_from_file, safe_write from ..utils.compat import text_type logger = log.get(__name__) diff --git a/vdirsyncer/storage/http.py b/vdirsyncer/storage/http.py index c40d4a4..574908f 100644 --- a/vdirsyncer/storage/http.py +++ b/vdirsyncer/storage/http.py @@ -8,10 +8,10 @@ ''' from .base import Item, Storage +from ..exceptions import NotFoundError from ..utils import expand_path, get_password, request from ..utils.compat import text_type, urlparse from ..utils.vobject import split_collection -from ..exceptions import NotFoundError USERAGENT = 'vdirsyncer' diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py index ee35d08..ba43c9f 100644 --- a/vdirsyncer/storage/singlefile.py +++ b/vdirsyncer/storage/singlefile.py @@ -9,12 +9,11 @@ import collections +from .. import exceptions, log from .base import Item, Storage -import vdirsyncer.exceptions as exceptions -import vdirsyncer.log as log -from ..utils import expand_path, safe_write, checkfile +from ..utils import checkfile, expand_path, safe_write from ..utils.compat import itervalues -from ..utils.vobject import split_collection, join_collection +from ..utils.vobject import join_collection, split_collection logger = log.get(__name__) diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 402496a..c9ff753 100644 --- a/vdirsyncer/utils/__init__.py +++ b/vdirsyncer/utils/__init__.py @@ -8,10 +8,11 @@ ''' import os + import requests -from .. import log, exceptions -from .compat import urlparse, get_raw_input, iteritems +from .. import exceptions, log +from .compat import get_raw_input, iteritems, urlparse logger = log.get(__name__) diff --git a/vdirsyncer/utils/vobject.py b/vdirsyncer/utils/vobject.py index a7596d8..01452d7 100644 --- a/vdirsyncer/utils/vobject.py +++ b/vdirsyncer/utils/vobject.py @@ -9,11 +9,11 @@ import hashlib import icalendar.cal -import icalendar.parser import icalendar.caselessdict +import icalendar.parser from . import cached_property, split_sequence -from .compat import text_type, itervalues +from .compat import itervalues, text_type def _process_properties(*s):