update black and format

Closes: #342
Pull-request: #342
Pull-request-sha: 21a0681

Change-Id: I9027433ec23ee19c9d9a47015e0327acf409e2d8

Author: CaselIT

.github/workflows/run-on-pr.yaml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   run-test:
-    name: ${{ matrix.python-version }}-${{ matrix.os }}
+    name: ${{ matrix.python-version }}-${{ matrix.os }}-${{matrix.tox-env}}
     runs-on: ${{ matrix.os }}
     strategy:
       # run this job using this matrix
@@ -19,6 +19,9 @@ jobs:
           - "ubuntu-latest"
         python-version:
           - "3.10"
+        tox-env:
+          - ""
+          - "-e pep8"
 
       fail-fast: false
 
@@ -40,4 +43,4 @@ jobs:
           pip list
 
       - name: Run tests
-        run: tox
+        run: tox ${{ matrix.tox-env }}

.pre-commit-config.yaml

@@ -2,13 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/python/black
-    rev: 19.3b0
+    rev: 21.9b0
     hooks:
     -   id: black
-        args: [-l 79]
 
 -   repo: https://github.com/sqlalchemyorg/zimports
-    rev: v0.4.0
+    rev: v0.4.1
     hooks:
     -   id: zimports
 

examples/bench/basic.py

@@ -1,11 +1,11 @@
 # basic.py - basic benchmarks adapted from Genshi
 # Copyright (C) 2006 Edgewall Software
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
-# 
+#
 #  1. Redistributions of source code must retain the above copyright
 #     notice, this list of conditions and the following disclaimer.
 #  2. Redistributions in binary form must reproduce the above copyright
@@ -15,7 +15,7 @@
 #  3. The name of the author may not be used to endorse or promote
 #     products derived from this software without specific prior
 #     written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
 # OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -33,68 +33,102 @@
 import timeit
 
 
-__all__ = ['mako', 'mako_inheritance', 'jinja2', 'jinja2_inheritance',
-            'cheetah', 'django', 'myghty', 'genshi', 'kid']
+__all__ = [
+    "mako",
+    "mako_inheritance",
+    "jinja2",
+    "jinja2_inheritance",
+    "cheetah",
+    "django",
+    "myghty",
+    "genshi",
+    "kid",
+]
 
 # Templates content and constants
-TITLE = 'Just a test'
-USER = 'joe'
-ITEMS = ['Number %d' % num for num in range(1, 15)]
+TITLE = "Just a test"
+USER = "joe"
+ITEMS = ["Number %d" % num for num in range(1, 15)]
+
 
 def genshi(dirname, verbose=False):
     from genshi.template import TemplateLoader
+
     loader = TemplateLoader([dirname], auto_reload=False)
-    template = loader.load('template.html')
+    template = loader.load("template.html")
+
     def render():
         data = dict(title=TITLE, user=USER, items=ITEMS)
-        return template.generate(**data).render('xhtml')
+        return template.generate(**data).render("xhtml")
 
     if verbose:
         print(render())
     return render
 
+
 def myghty(dirname, verbose=False):
     from myghty import interp
+
     interpreter = interp.Interpreter(component_root=dirname)
+
     def render():
         data = dict(title=TITLE, user=USER, items=ITEMS)
         buffer = StringIO()
-        interpreter.execute("template.myt", request_args=data, out_buffer=buffer)
+        interpreter.execute(
+            "template.myt", request_args=data, out_buffer=buffer
+        )
         return buffer.getvalue()
+
     if verbose:
         print(render())
     return render
 
+
 def mako(dirname, verbose=False):
     from mako.template import Template
     from mako.lookup import TemplateLookup
+
     lookup = TemplateLookup(directories=[dirname], filesystem_checks=False)
-    template = lookup.get_template('template.html')
+    template = lookup.get_template("template.html")
+
     def render():
         return template.render(title=TITLE, user=USER, list_items=ITEMS)
+
     if verbose:
         print(template.code + " " + render())
     return render
+
+
 mako_inheritance = mako
 
+
 def jinja2(dirname, verbose=False):
     from jinja2 import Environment, FileSystemLoader
+
     env = Environment(loader=FileSystemLoader(dirname))
-    template = env.get_template('template.html')
+    template = env.get_template("template.html")
+
     def render():
         return template.render(title=TITLE, user=USER, list_items=ITEMS)
+
     if verbose:
         print(render())
     return render
+
+
 jinja2_inheritance = jinja2
 
+
 def cheetah(dirname, verbose=False):
     from Cheetah.Template import Template
-    filename = os.path.join(dirname, 'template.tmpl')
+
+    filename = os.path.join(dirname, "template.tmpl")
     template = Template(file=filename)
+
     def render():
-        template.__dict__.update({'title': TITLE, 'user': USER,
-                                  'list_items': ITEMS})
+        template.__dict__.update(
+            {"title": TITLE, "user": USER, "list_items": ITEMS}
+        )
         return template.respond()
 
     if verbose:
@@ -103,30 +137,37 @@ def render():
         print(render())
     return render
 
+
 def django(dirname, verbose=False):
     from django.conf import settings
-    settings.configure(TEMPLATE_DIRS=[os.path.join(dirname, 'templates')])
+
+    settings.configure(TEMPLATE_DIRS=[os.path.join(dirname, "templates")])
     from django import template, templatetags
     from django.template import loader
-    templatetags.__path__.append(os.path.join(dirname, 'templatetags'))
-    tmpl = loader.get_template('template.html')
+
+    templatetags.__path__.append(os.path.join(dirname, "templatetags"))
+    tmpl = loader.get_template("template.html")
 
     def render():
-        data = {'title': TITLE, 'user': USER, 'items': ITEMS}
+        data = {"title": TITLE, "user": USER, "items": ITEMS}
         return tmpl.render(template.Context(data))
 
     if verbose:
         print(render())
     return render
 
+
 def kid(dirname, verbose=False):
     import kid
+
     kid.path = kid.TemplatePath([dirname])
-    template = kid.Template(file='template.kid')
+    template = kid.Template(file="template.kid")
+
     def render():
-        template = kid.Template(file='template.kid',
-                                title=TITLE, user=USER, items=ITEMS)
-        return template.serialize(output='xhtml')
+        template = kid.Template(
+            file="template.kid", title=TITLE, user=USER, items=ITEMS
+        )
+        return template.serialize(output="xhtml")
 
     if verbose:
         print(render())
@@ -138,42 +179,46 @@ def run(engines, number=2000, verbose=False):
     for engine in engines:
         dirname = os.path.join(basepath, engine)
         if verbose:
-            print('%s:' % engine.capitalize())
-            print('--------------------------------------------------------')
+            print("%s:" % engine.capitalize())
+            print("--------------------------------------------------------")
         else:
-            sys.stdout.write('%s:' % engine.capitalize())
-        t = timeit.Timer(setup='from __main__ import %s; render = %s(r"%s", %s)'
-                                       % (engine, engine, dirname, verbose),
-                                 stmt='render()')
+            sys.stdout.write("%s:" % engine.capitalize())
+        t = timeit.Timer(
+            setup='from __main__ import %s; render = %s(r"%s", %s)'
+            % (engine, engine, dirname, verbose),
+            stmt="render()",
+        )
 
         time = t.timeit(number=number) / number
         if verbose:
-            print('--------------------------------------------------------')
-        print('%.2f ms' % (1000 * time))
+            print("--------------------------------------------------------")
+        print("%.2f ms" % (1000 * time))
         if verbose:
-            print('--------------------------------------------------------')
+            print("--------------------------------------------------------")
 
 
-if __name__ == '__main__':
-    engines = [arg for arg in sys.argv[1:] if arg[0] != '-']
+if __name__ == "__main__":
+    engines = [arg for arg in sys.argv[1:] if arg[0] != "-"]
     if not engines:
         engines = __all__
 
-    verbose = '-v' in sys.argv
+    verbose = "-v" in sys.argv
 
-    if '-p' in sys.argv:
+    if "-p" in sys.argv:
         try:
             import hotshot, hotshot.stats
+
             prof = hotshot.Profile("template.prof")
             benchtime = prof.runcall(run, engines, number=100, verbose=verbose)
             stats = hotshot.stats.load("template.prof")
         except ImportError:
             import cProfile, pstats
+
             stmt = "run(%r, number=%r, verbose=%r)" % (engines, 1000, verbose)
             cProfile.runctx(stmt, globals(), {}, "template.prof")
             stats = pstats.Stats("template.prof")
         stats.strip_dirs()
-        stats.sort_stats('time', 'calls')
+        stats.sort_stats("time", "calls")
         stats.print_stats()
     else:
         run(engines, verbose=verbose)

examples/bench/django/templatetags/bench.py

@@ -3,6 +3,9 @@
 
 register = Library()
 
+
 def greeting(name):
-    return 'Hello, %s!' % escape(name)
+    return "Hello, %s!" % escape(name)
+
+
 greeting = register.simple_tag(greeting)