diff --git a/build.sh b/build.sh index f7b3cea..7075f46 100755 --- a/build.sh +++ b/build.sh @@ -50,7 +50,7 @@ command__tests() { } command__install_style() { - $PIP_INSTALL flake8 + $PIP_INSTALL flake8 flake8-import-order } command__style() { diff --git a/tests/storage/test_filesystem.py b/tests/storage/test_filesystem.py index 5097307..6de3fe2 100644 --- a/tests/storage/test_filesystem.py +++ b/tests/storage/test_filesystem.py @@ -12,8 +12,8 @@ import os import pytest -from vdirsyncer.utils.vobject import Item from vdirsyncer.storage.filesystem import FilesystemStorage +from vdirsyncer.utils.vobject import Item from . import StorageTests diff --git a/vdirsyncer/cli.py b/vdirsyncer/cli.py index 9609cf0..22dea7b 100644 --- a/vdirsyncer/cli.py +++ b/vdirsyncer/cli.py @@ -13,7 +13,7 @@ import os import sys import threading -from . import __version__, PROJECT_HOME, DOCS_HOME, log +from . import DOCS_HOME, PROJECT_HOME, __version__, log from .doubleclick import click from .storage import storage_names from .sync import StorageEmpty, SyncConflict, sync diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index bcf4c2a..7ce521e 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -13,9 +13,9 @@ from lxml import etree from requests import session as requests_session -from .. import exceptions, log, utils from .base import Item, Storage from .http import USERAGENT, prepare_auth, prepare_verify +from .. import exceptions, log, utils dav_logger = log.get(__name__) diff --git a/vdirsyncer/storage/filesystem.py b/vdirsyncer/storage/filesystem.py index e29c44d..b21bdf9 100644 --- a/vdirsyncer/storage/filesystem.py +++ b/vdirsyncer/storage/filesystem.py @@ -9,8 +9,8 @@ import os -from .. import exceptions, log from .base import Item, Storage +from .. import exceptions, log from ..utils import checkdir, expand_path, get_etag_from_file, safe_write from ..utils.compat import text_type diff --git a/vdirsyncer/storage/singlefile.py b/vdirsyncer/storage/singlefile.py index 41ab3dd..165db86 100644 --- a/vdirsyncer/storage/singlefile.py +++ b/vdirsyncer/storage/singlefile.py @@ -10,8 +10,8 @@ import collections import os -from .. import exceptions, log from .base import Item, Storage +from .. import exceptions, log from ..utils import checkfile, expand_path, safe_write from ..utils.compat import iteritems, itervalues from ..utils.vobject import join_collection, split_collection diff --git a/vdirsyncer/utils/__init__.py b/vdirsyncer/utils/__init__.py index 556b2f6..9b1e123 100644 --- a/vdirsyncer/utils/__init__.py +++ b/vdirsyncer/utils/__init__.py @@ -13,9 +13,9 @@ import threading import requests from requests.packages.urllib3.poolmanager import PoolManager +from .compat import iteritems, urlparse from .. import exceptions, log from ..doubleclick import click, ctx -from .compat import iteritems, urlparse logger = log.get(__name__)