Flake8 fixes (mostly removing useless module imports)

grantjenks · grantjenks · commit 99f0ca2439f6 · 2021-01-22T11:53:46.000-08:00
diff --git a/tests/benchmark_core.py b/tests/benchmark_core.py
@@ -12,7 +12,6 @@
 import pickle
 import random
 import shutil
-import sys
 import time
 import warnings
 
@@ -30,7 +29,7 @@
 # Disk Cache Benchmarks
 ###############################################################################
 
-import diskcache
+import diskcache  # noqa
 
 caches.append(
     (
@@ -123,13 +122,13 @@ def worker(num, kind, args, kwargs):
             start = time.time()
             result = obj.set(key, value)
             end = time.time()
-            miss = result == False
+            miss = result is False
             action = 'set'
         else:
             start = time.time()
             result = obj.delete(key)
             end = time.time()
-            miss = result == False
+            miss = result is False
             action = 'delete'
 
         if count > WARMUP:
@@ -154,7 +153,7 @@ def dispatch():
 
         try:
             obj.close()
-        except:
+        except Exception:
             pass
 
         processes = [
diff --git a/tests/benchmark_djangocache.py b/tests/benchmark_djangocache.py
@@ -12,9 +12,7 @@
 import pickle
 import random
 import shutil
-import sys
 import time
-import warnings
 
 from utils import display
 
@@ -59,13 +57,13 @@ def worker(num, name):
             start = time.time()
             result = obj.set(key, value)
             end = time.time()
-            miss = result == False
+            miss = result is False
             action = 'set'
         else:
             start = time.time()
             result = obj.delete(key)
             end = time.time()
-            miss = result == False
+            miss = result is False
             action = 'delete'
 
         if count > WARMUP:
@@ -91,14 +89,14 @@ def prepare(name):
 
     try:
         obj.close()
-    except:
+    except Exception:
         pass
 
 
 def dispatch():
     setup()
 
-    from django.core.cache import caches
+    from django.core.cache import caches  # noqa
 
     for name in ['locmem', 'memcached', 'redis', 'diskcache', 'filebased']:
         shutil.rmtree('tmp', ignore_errors=True)
diff --git a/tests/issue_85.py b/tests/issue_85.py
@@ -109,7 +109,7 @@ def run(statements):
             shard._sql(statement)
             if index == 0:
                 values.append(('BEGIN', ident))
-    except sqlite3.OperationalError as exc:
+    except sqlite3.OperationalError:
         values.append(('ERROR', ident))
 
 
diff --git a/tests/plot.py b/tests/plot.py
@@ -48,7 +48,7 @@ def parse_data(infile):
         if blocks.match(line):
             try:
                 name = title.match(lines[index + 1]).group(1)
-            except:
+            except Exception:
                 index += 1
                 continue
 
diff --git a/tests/plot_early_recompute.py b/tests/plot_early_recompute.py
@@ -22,7 +22,7 @@ def timer(func):
         @ft.wraps(func)
         def wrapper(*args, **kwargs):
             start = time.time()
-            result = func(*args, **kwargs)
+            func(*args, **kwargs)
             pair = start, time.time()
             with lock:
                 times.append(pair)
diff --git a/tests/settings_benchmark.py b/tests/settings_benchmark.py
@@ -1,9 +1,9 @@
-from .settings import *
+from .settings import *  # noqa
 
 CACHES = {
     'default': {
         'BACKEND': 'diskcache.DjangoCache',
-        'LOCATION': CACHE_DIR,
+        'LOCATION': CACHE_DIR,  # noqa
     },
     'memcached': {
         'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache',
diff --git a/tests/stress_test_core.py b/tests/stress_test_core.py
@@ -7,7 +7,6 @@
 import queue
 import random
 import shutil
-import sys
 import threading
 import time
 import warnings
@@ -196,15 +195,15 @@ def dispatch(num, eviction_policy, processes, threads):
     for thread_queue in thread_queues:
         thread_queue.put(None)
 
-    start = time.time()
+    # start = time.time()
 
     for thread in subthreads:
         thread.start()
 
     for thread in subthreads:
         thread.join()
 
-    stop = time.time()
+    # stop = time.time()
 
     timings = co.defaultdict(list)
 
@@ -396,7 +395,7 @@ def stress_test_mp():
     parser.add_argument(
         '-v',
         '--eviction-policy',
-        type=unicode,
+        type=str,
         default=u'least-recently-stored',
     )
 
diff --git a/tests/stress_test_deque.py b/tests/stress_test_deque.py
@@ -2,7 +2,6 @@
 
 import collections as co
 import functools as ft
-import itertools as it
 import random
 
 import diskcache as dc
diff --git a/tests/stress_test_deque_mp.py b/tests/stress_test_deque_mp.py
@@ -1,6 +1,5 @@
 """Stress test diskcache.persistent.Deque."""
 
-import functools as ft
 import itertools as it
 import multiprocessing as mp
 import os
diff --git a/tests/stress_test_fanout.py b/tests/stress_test_fanout.py
@@ -1,13 +1,11 @@
 "Stress test diskcache.core.Cache."
 
-import collections as co
 import multiprocessing as mp
 import os
 import pickle
 import queue
 import random
 import shutil
-import sys
 import threading
 import time
 import warnings
@@ -388,7 +386,7 @@ def stress_test_mp():
     parser.add_argument(
         '-v',
         '--eviction-policy',
-        type=unicode,
+        type=str,
         default=u'least-recently-stored',
     )
 
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -1,22 +1,17 @@
 "Test diskcache.core.Cache."
 
-import collections as co
 import errno
-import functools as ft
 import hashlib
 import io
 import os
 import os.path as op
 import pickle
-import random
 import shutil
 import sqlite3
 import subprocess as sp
-import sys
 import tempfile
 import threading
 import time
-import unittest
 import warnings
 from unittest import mock
 
@@ -130,7 +125,7 @@ def test_init_makedirs():
     with pytest.raises(EnvironmentError):
         try:
             with mock.patch('os.makedirs', makedirs):
-                cache = dc.Cache(cache_dir)
+                dc.Cache(cache_dir)
         except EnvironmentError:
             shutil.rmtree(cache_dir, ignore_errors=True)
             raise
@@ -244,7 +239,7 @@ def test_read(cache):
 
 def test_read_keyerror(cache):
     with pytest.raises(KeyError):
-        with cache.read(0) as reader:
+        with cache.read(0):
             pass
 
 
diff --git a/tests/test_deque.py b/tests/test_deque.py
@@ -1,6 +1,5 @@
 "Test diskcache.persistent.Deque."
 
-import functools as ft
 import pickle
 import shutil
 import tempfile
@@ -278,7 +277,3 @@ def test_rotate_indexerror_negative(deque):
 
     with mock.patch.object(deque, '_cache', cache):
         deque.rotate(-1)
-
-
-def test_repr(deque):
-    assert repr(deque).startswith('Deque(')
diff --git a/tests/test_doctest.py b/tests/test_doctest.py
@@ -1,6 +1,4 @@
 import doctest
-import shutil
-import sys
 
 import diskcache.core
 import diskcache.djangocache
diff --git a/tests/test_fanout.py b/tests/test_fanout.py
@@ -1,18 +1,13 @@
 "Test diskcache.fanout.FanoutCache."
 
 import collections as co
-import errno
-import functools as ft
 import hashlib
 import io
 import os
 import os.path as op
 import pickle
-import random
 import shutil
-import sqlite3
 import subprocess as sp
-import sys
 import tempfile
 import threading
 import time
@@ -67,7 +62,7 @@ def test_set_get_delete(cache):
 
     for value in range(100):
         assert cache.delete(value)
-    assert cache.delete(100) == False
+    assert cache.delete(100) is False
 
     cache.check()
 
@@ -353,7 +348,7 @@ def test_read(cache):
 
 def test_read_keyerror(cache):
     with pytest.raises(KeyError):
-        with cache.read(0) as reader:
+        with cache.read(0):
             pass
 
 
diff --git a/tests/test_index.py b/tests/test_index.py
@@ -1,11 +1,8 @@
 "Test diskcache.persistent.Index."
 
-import functools as ft
 import pickle
 import shutil
-import sys
 import tempfile
-from unittest import mock
 
 import pytest
 
diff --git a/tests/test_recipes.py b/tests/test_recipes.py
@@ -3,7 +3,6 @@
 import shutil
 import threading
 import time
-from unittest import mock
 
 import pytest
 
diff --git a/tests/utils.py b/tests/utils.py
@@ -18,7 +18,6 @@ def percentile(sequence, percent):
 
 def secs(value):
     units = ['s ', 'ms', 'us', 'ns']
-    pos = 0
 
     if value is None:
         return '  0.000ns'
@@ -60,24 +59,6 @@ def unmount_ramdisk(dev_path, path):
     run('rm', '-r', path)
 
 
-def retry(sql, query):
-    pause = 0.001
-    error = sqlite3.OperationalError
-
-    for _ in range(int(LIMITS[u'timeout'] / pause)):
-        try:
-            sql(query).fetchone()
-        except sqlite3.OperationalError as exc:
-            error = exc
-            time.sleep(pause)
-        else:
-            break
-    else:
-        raise error
-
-    del error
-
-
 def display(name, timings):
     cols = ('Action', 'Count', 'Miss', 'Median', 'P90', 'P99', 'Max', 'Total')
     template = ' '.join(['%9s'] * len(cols))
