Make stylechecker happy

vdirsyncer/cli/utils.py

@@ -9,11 +9,13 @@ import sys
 import threading
 from itertools import chain
 
+from atomicwrites import atomic_write
+
 from .. import DOCS_HOME, PROJECT_HOME, exceptions, log
 from ..doubleclick import click
 from ..storage import storage_names
 from ..sync import IdentConflict, StorageEmpty, SyncConflict
-from ..utils import atomic_write, expand_path, get_class_init_args
+from ..utils import expand_path, get_class_init_args
 from ..utils.compat import text_type
 
 

vdirsyncer/storage/filesystem.py

@@ -3,10 +3,12 @@
 import errno
 import os
 
+from atomicwrites import atomic_write
+
 from .base import Item, Storage
 from .. import exceptions, log
-from ..utils import atomic_write, checkdir, expand_path, \
+from ..utils import checkdir, expand_path, get_etag_from_file, \
-    get_etag_from_file, get_etag_from_fileobject
+    get_etag_from_fileobject
 from ..utils.compat import text_type
 
 logger = log.get(__name__)

vdirsyncer/storage/singlefile.py

@@ -3,9 +3,11 @@
 import collections
 import os
 
+from atomicwrites import atomic_write
+
 from .base import Item, Storage
 from .. import exceptions, log
-from ..utils import atomic_write, checkfile, expand_path
+from ..utils import checkfile, expand_path
 from ..utils.compat import iteritems, itervalues
 from ..utils.vobject import join_collection, split_collection
 

vdirsyncer/utils/__init__.py

@@ -2,9 +2,6 @@
 
 import os
 import threading
-import uuid
-
-from atomicwrites import atomic_write
 
 import requests
 from requests.packages.urllib3.poolmanager import PoolManager