Make imports consistent with isort

Author: grantjenks

diskcache/__init__.py

@@ -7,18 +7,28 @@
 """
 
 from .core import (
+    DEFAULT_SETTINGS,
+    ENOVAL,
+    EVICTION_POLICY,
+    UNKNOWN,
     Cache,
     Disk,
     EmptyDirWarning,
     JSONDisk,
-    UnknownFileWarning,
     Timeout,
+    UnknownFileWarning,
 )
-from .core import DEFAULT_SETTINGS, ENOVAL, EVICTION_POLICY, UNKNOWN
 from .fanout import FanoutCache
 from .persistent import Deque, Index
-from .recipes import Averager, BoundedSemaphore, Lock, RLock
-from .recipes import barrier, memoize_stampede, throttle
+from .recipes import (
+    Averager,
+    BoundedSemaphore,
+    Lock,
+    RLock,
+    barrier,
+    memoize_stampede,
+    throttle,
+)
 
 __all__ = [
     'Averager',

diskcache/djangocache.py

@@ -1,6 +1,7 @@
 "Django-compatible disk and file backed cache."
 
 from functools import wraps
+
 from django.core.cache.backends.base import BaseCache
 
 try:

diskcache/fanout.py

@@ -9,7 +9,7 @@
 import tempfile
 import time
 
-from .core import ENOVAL, DEFAULT_SETTINGS, Cache, Disk, Timeout
+from .core import DEFAULT_SETTINGS, ENOVAL, Cache, Disk, Timeout
 from .persistent import Deque, Index
 
 

diskcache/persistent.py

@@ -3,14 +3,18 @@
 """
 
 import operator as op
-
 from collections import OrderedDict
-from collections.abc import MutableMapping, Sequence
-from collections.abc import KeysView, ValuesView, ItemsView
+from collections.abc import (
+    ItemsView,
+    KeysView,
+    MutableMapping,
+    Sequence,
+    ValuesView,
+)
 from contextlib import contextmanager
 from shutil import rmtree
 
-from .core import Cache, ENOVAL
+from .core import ENOVAL, Cache
 
 
 def _make_compare(seq_op, doc):

setup.py

@@ -1,4 +1,5 @@
 from io import open
+
 from setuptools import setup
 from setuptools.command.test import test as TestCommand
 

tests/benchmark_kv_store.py

@@ -4,10 +4,10 @@
 
 """
 
-import diskcache
-
 from IPython import get_ipython
 
+import diskcache
+
 ipython = get_ipython()
 assert ipython is not None, 'No IPython! Run with $ ipython ...'
 

tests/issue_109.py

@@ -3,6 +3,7 @@
 """
 
 import time
+
 import diskcache as dc
 
 

tests/issue_85.py

@@ -6,14 +6,15 @@
 """
 
 import collections
-import django
 import os
 import random
 import shutil
 import sqlite3
 import threading
 import time
 
+import django
+
 
 def remove_cache_dir():
     print('REMOVING CACHE DIRECTORY')

tests/plot.py

@@ -7,10 +7,11 @@
 
 import argparse
 import collections as co
-import matplotlib.pyplot as plt
 import re
 import sys
 
+import matplotlib.pyplot as plt
+
 
 def parse_timing(timing, limit):
     "Parse timing."

tests/plot_early_recompute.py

@@ -2,13 +2,14 @@
 
 """
 
-import diskcache as dc
 import functools as ft
 import multiprocessing.pool
 import shutil
 import threading
 import time
 
+import diskcache as dc
+
 
 def make_timer(times):
     """Make a decorator which accumulates (start, end) in `times` for function