Modernise Python style/imports

Author: danpalmer

django_lightweight_queue/app_settings.py

@@ -2,10 +2,12 @@
 
 from . import constants
 
+
 def setting(suffix, default):
     attr_name = '{}{}'.format(constants.SETTING_NAME_PREFIX, suffix)
     return getattr(settings, attr_name, default)
 
+
 WORKERS = setting('WORKERS', {})
 BACKEND = setting('BACKEND', 'django_lightweight_queue.backends.synchronous.SynchronousBackend')
 

django_lightweight_queue/apps.py

@@ -2,6 +2,7 @@
 
 from .utils import load_all_tasks
 
+
 class DjangoLightweightQueueConfig(AppConfig):
     name = 'django_lightweight_queue'
 

django_lightweight_queue/backends/redis.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import # For 'redis'
-
 import redis
 
 from ..job import Job
@@ -9,6 +7,7 @@ class RedisBackend(object):
     """
     This backend has at-most-once semantics.
     """
+
     def __init__(self):
         self.client = redis.StrictRedis(
             host=app_settings.REDIS_HOST,

django_lightweight_queue/backends/reliable_redis.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import # For 'redis'
-
 import redis
 
 from ..job import Job

django_lightweight_queue/cron_scheduler.py

@@ -127,7 +127,7 @@ def get_matcher(minval, maxval, t):
         for row in mod.CONFIG:
             row['min_matcher'] = get_matcher(0, 59, row.get('minutes'))
             row['hour_matcher'] = get_matcher(0, 23, row.get('hours'))
-            row['day_matcher'] = get_matcher(1,  7, row.get('days', '*'))
+            row['day_matcher'] = get_matcher(1, 7, row.get('days', '*'))
             row['queue'] = row.get('queue', 'cron')
             row['timeout'] = row.get('timeout', None)
             row['sigkill_on_stop'] = row.get('sigkill_on_stop', False)

django_lightweight_queue/exposition.py

@@ -1,12 +1,7 @@
 import json
 import threading
-
 from socket import gethostname
-
-try:
-    from http.server import HTTPServer
-except ImportError:
-    from BaseHTTPServer import HTTPServer
+from http.server import HTTPServer
 
 from prometheus_client.exposition import MetricsHandler
 
@@ -30,7 +25,7 @@ def get_config_response(worker_queue_and_counts):
             "labels": {
                 "django_lightweight_queue_worker_queue": queue,
                 "django_lightweight_queue_worker_num": str(worker_num),
-            }
+            },
         }
         for index, (queue, worker_num) in enumerate(worker_queue_and_counts, start=1)
     ]

django_lightweight_queue/job.py

@@ -10,7 +10,8 @@
 
 TIME_FORMAT = '%Y-%m-%d %H:%M:%S.%f'
 
-class Job(object):
+
+class Job:
     def __init__(self, path, args, kwargs, timeout=None, sigkill_on_stop=False):
         self.path = path
         self.args = args

django_lightweight_queue/machine_types.py

@@ -5,7 +5,7 @@
 from .cron_scheduler import CRON_QUEUE_NAME
 
 
-class Machine(object):
+class Machine:
     """
     Dummy machine class to contain documentation.
 
@@ -72,7 +72,7 @@ def worker_names(self):
                 continue
 
             for worker_num in range(1, num_workers + 1):
-                if (job_number % self.machine_count) + 1 == self.machine_number:
+                if (job_number % self.machine_count) + 1 == self.machine_number: # noqa: S001
                     worker_names.append((queue, worker_num))
 
                 job_number += 1

django_lightweight_queue/middleware/logging.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 import json
 import logging
 import traceback

django_lightweight_queue/task.py

@@ -3,7 +3,7 @@
 
 from . import app_settings
 
-class task(object):
+class task:
     def __init__(self, queue='default', timeout=None, sigkill_on_stop=False, atomic=None):
         """
         Define a task to be run.
@@ -71,7 +71,8 @@ def slow_fn(arg):
     def __call__(self, fn):
         return TaskWrapper(fn, self.queue, self.timeout, self.sigkill_on_stop, self.atomic)
 
-class TaskWrapper(object):
+
+class TaskWrapper:
     def __init__(self, fn, queue, timeout, sigkill_on_stop, atomic):
         self.fn = fn
         self.queue = queue