Merge pull request #49 from ulgens/clean-pre3.8

Clean pre3.8

Author: FlipperPA

.pre-commit-config.yaml

@@ -0,0 +1,6 @@
+repos:
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v3.21.0
+    hooks:
+    -   id: pyupgrade
+        args: ["--py38-plus"]

djclick/adapter.py

@@ -8,7 +8,7 @@
 from django.core.management import CommandError
 
 
-class ArgumentParserDefaults(object):
+class ArgumentParserDefaults:
     def __init__(self, args):
         self._args = args
 
@@ -18,7 +18,7 @@ def _get_kwargs(self):
         }
 
 
-class ArgumentParserAdapter(object):
+class ArgumentParserAdapter:
     def __init__(self):
         self._actions = []
         self._mutually_exclusive_groups = []
@@ -27,7 +27,7 @@ def parse_args(self, args):
         return ArgumentParserDefaults(args)
 
 
-class DjangoCommandMixin(object):
+class DjangoCommandMixin:
     use_argparse = False
     option_list = []
     base_stealth_options = []
@@ -40,13 +40,13 @@ def stealth_options(self):
 
     def invoke(self, ctx):
         try:
-            return super(DjangoCommandMixin, self).invoke(ctx)
+            return super().invoke(ctx)
         except CommandError as e:
             # Honor the --traceback flag
             if ctx.traceback:  # NOCOV
                 raise
             styled_message = click.style(
-                "{}: {}".format(e.__class__.__name__, e), fg="red", bold=True
+                f"{e.__class__.__name__}: {e}", fg="red", bold=True
             )
             click.echo(styled_message, err=True)
             ctx.exit(1)
@@ -55,7 +55,7 @@ def run_from_argv(self, argv):
         """
         Called when run from the command line.
         """
-        prog_name = "{} {}".format(os.path.basename(argv[0]), argv[1])
+        prog_name = f"{os.path.basename(argv[0])} {argv[1]}"
         try:
             # We won't get an exception here in standalone_mode=False
             exit_code = self.main(
@@ -76,7 +76,7 @@ def create_parser(self, progname, subcommand):
         return ArgumentParserAdapter()
 
     def print_help(self, prog_name, subcommand):
-        prog_name = "{} {}".format(prog_name, subcommand)
+        prog_name = f"{prog_name} {subcommand}"
         self.main(["--help"], prog_name=prog_name, standalone_mode=False)
 
     def map_names(self):
@@ -140,7 +140,7 @@ def suppress_colors(ctx, param, value):
     return value
 
 
-class BaseRegistrator(object):
+class BaseRegistrator:
     common_options = [
         click.option(
             "-v",

djclick/params.py

@@ -10,12 +10,12 @@ def __init__(self, qs, lookup="pk"):
         if isinstance(qs, type) and issubclass(qs, models.Model):
             qs = qs.objects.all()
         self.qs = qs
-        self.name = "{}.{}".format(qs.model._meta.app_label, qs.model.__name__,)
+        self.name = f"{qs.model._meta.app_label}.{qs.model.__name__}"
         self.lookup = lookup
 
     def convert(self, value, param, ctx):
         if value is None:  # NOCOV
-            return super(ModelInstance, self).convert(value, param, ctx)
+            return super().convert(value, param, ctx)
         try:
             return self.qs.get(**{self.lookup: value})
         except ObjectDoesNotExist:

djclick/test/conftest.py

@@ -29,7 +29,7 @@ def call(*args, **kwargs):
 def call_command():
     from django.core.management import call_command
 
-    class CallCommand(object):
+    class CallCommand:
         def __init__(self):
             self.io = BytesIO()
 

djclick/test/test_params.py

@@ -41,5 +41,5 @@ def test_convert_fail(call_command, args, error_message):
     # Use `.endswith()` because of differences between CPython and pypy
     assert e.type is BadParameter
     assert str(e.value).endswith(
-        "could not find testapp.DummyModel with {}".format(error_message)
+        f"could not find testapp.DummyModel with {error_message}"
     )

setup.py

@@ -32,7 +32,7 @@
     sys.exit()
 
 
-class Setup(object):
+class Setup:
     @staticmethod
     def read(fname, fail_silently=False):
         """
@@ -41,7 +41,7 @@ def read(fname, fail_silently=False):
         """
         try:
             filepath = os.path.join(os.path.dirname(__file__), fname)
-            with io.open(filepath, "rt", encoding="utf8") as f:
+            with open(filepath, encoding="utf8") as f:
                 return f.read()
         except:
             if not fail_silently:
@@ -90,7 +90,7 @@ def get_files(*bases):
     def get_metavar(name):
         data = Setup.read(os.path.join(PACKAGE, "__init__.py"))
         value = (
-            re.search(u"__{}__\s*=\s*u?'([^']+)'".format(name), data).group(1).strip()
+            re.search(fr"__{name}__\s*=\s*u?'([^']+)'", data).group(1).strip()
         )
         return value