Syntax modernisations for Python 3.10

Author: voyc-jean

cacheback/base.py

@@ -28,15 +28,15 @@ def to_bytestring(value):
     :returns: a bytestring
     """
     if isinstance(value, DjangoModel):
-        return ('%s:%s' % (value.__class__, hash(value))).encode('utf-8')
+        return (f'{value.__class__}:{hash(value)}').encode('utf-8')
     if isinstance(value, str):
         return value.encode('utf8')
     if isinstance(value, bytes):
         return value
     return bytes(str(value), 'utf8')
 
 
-class Job(object):
+class Job:
     """
     A cached read job.
 
@@ -90,7 +90,7 @@ class Job(object):
 
     @property
     def class_path(self):
-        return '%s.%s' % (self.__module__, self.__class__.__name__)
+        return f'{self.__module__}.{self.__class__.__name__}'
 
     def __init__(self):
         self.cache_alias = self.cache_alias or getattr(
@@ -402,11 +402,11 @@ def key(self, *args, **kwargs):
             return self.class_path
         try:
             if args and not kwargs:
-                return "%s:%s" % (self.class_path, self.hash(args))
+                return f"{self.class_path}:{self.hash(args)}"
             # The line might break if your passed values are un-hashable.  If
             # it does, you need to override this method and implement your own
             # key algorithm.
-            return "%s:%s:%s:%s" % (
+            return "{}:{}:{}:{}".format(
                 self.class_path,
                 self.hash(args),
                 self.hash([k for k in sorted(kwargs)]),

cacheback/jobs.py

@@ -19,7 +19,7 @@ def __init__(
         task_options=None,
         set_data_kwarg=None,
     ):
-        super(FunctionJob, self).__init__()
+        super().__init__()
         if lifetime is not None:
             self.lifetime = int(lifetime)
         if fetch_on_miss is not None:
@@ -43,7 +43,7 @@ def get_init_kwargs(self):
     def prepare_args(self, fn, *args):
         # Convert function into "module:name" form so that is can be pickled and
         # then re-imported.
-        return ("%s:%s" % (fn.__module__, fn.__name__),) + args
+        return (f"{fn.__module__}:{fn.__name__}",) + args
 
     def fetch(self, fn_string, *args, **kwargs):
         # Import function from string representation
@@ -67,7 +67,7 @@ def __init__(
         """
         :model: The model class to use
         """
-        super(QuerySetJob, self).__init__()
+        super().__init__()
         self.model = model
         if lifetime is not None:
             self.lifetime = lifetime
@@ -82,7 +82,7 @@ def get_init_kwargs(self):
         return {'model': self.model, 'lifetime': self.lifetime, 'cache_alias': self.cache_alias}
 
     def key(self, *args, **kwargs):
-        return "%s-%s" % (self.model.__name__, super(QuerySetJob, self).key(*args, **kwargs))
+        return f"{self.model.__name__}-{super().key(*args, **kwargs)}"
 
 
 class QuerySetGetJob(QuerySetJob):

cacheback/utils.py

@@ -58,4 +58,4 @@ def enqueue_task(kwargs, task_options=None):
     elif task_queue == 'celery' and celery_refresh_cache is not None:
         return celery_refresh_cache.apply_async(kwargs=kwargs, **task_options or {})
 
-    raise ImproperlyConfigured('Unkown task queue configured: {0}'.format(task_queue))
+    raise ImproperlyConfigured(f'Unkown task queue configured: {task_queue}')

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # django-cacheback documentation build configuration file, created by
 # sphinx-quickstart on Mon Jul 30 21:40:46 2012.
@@ -50,8 +49,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'django-cacheback'
-copyright = u'2012, David Winterbottom'
+project = 'django-cacheback'
+copyright = '2012, David Winterbottom'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -194,8 +193,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'django-cacheback', u'django-cacheback Documentation',
-   u'David Winterbottom', 'manual'),
+  ('index', 'django-cacheback', 'django-cacheback Documentation',
+   'David Winterbottom', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -224,8 +223,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'django-cacheback', u'django-cacheback Documentation',
-     [u'David Winterbottom'], 1)
+    ('index', 'django-cacheback', 'django-cacheback Documentation',
+     ['David Winterbottom'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -238,8 +237,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'django-cacheback', u'django-cacheback Documentation',
-   u'David Winterbottom', 'django-cacheback', 'One line description of project.',
+  ('index', 'django-cacheback', 'django-cacheback Documentation',
+   'David Winterbottom', 'django-cacheback', 'One line description of project.',
    'Miscellaneous'),
 ]
 

sandbox/dummyapp/migrations/0001_initial.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.9 on 2015-12-12 20:02
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 

sandbox/settings.py

@@ -182,5 +182,5 @@
     }
 }
 
-CACHEBACK_TASK_QUEUE = dict([(q, q) for q in ('celery', 'rq')]).get(
+CACHEBACK_TASK_QUEUE = {q: q for q in ('celery', 'rq')}.get(
     os.environ.get('QUEUE', ''), 'celery')

tests/test_base_job.py

@@ -12,7 +12,7 @@
 
 class DummyJob(Job):
     def fetch(self, param):
-        return ('JOB-EXECUTED:{0}'.format(param), timezone.now())
+        return (f'JOB-EXECUTED:{param}', timezone.now())
 
 
 class CacheAliasDummyJob(DummyJob):

tests/test_decorators.py

@@ -10,22 +10,22 @@ class OtherFunctionJob(FunctionJob):
 
 @cacheback(fetch_on_miss=False, job_class=OtherFunctionJob)
 def no_fetch_miss_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @cacheback(lifetime=30, fetch_on_miss=True)
 def fetch_miss_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @cacheback(cache_alias='secondary', fetch_on_miss=True)
 def fetch_cache_alias_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @cacheback(set_data_kwarg='my_data')
 def custom_payload_label_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @pytest.mark.usefixtures('cleared_cache', scope='function')

tests/test_jobs.py

@@ -6,12 +6,12 @@
 
 
 def dummy_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @cacheback()
 def decorated_dummy_function(param):
-    return 'JOB-EXECUTED:{0}'.format(param)
+    return f'JOB-EXECUTED:{param}'
 
 
 @pytest.mark.usefixtures('cleared_cache', scope='function')