bump black, zimports

Change-Id: Id9afb5a6dfd02ce37b11486a046ca522fcd3c91a

.pre-commit-config.yaml

@@ -2,12 +2,12 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
 -   repo: https://github.com/python/black
-    rev: 22.3.0
+    rev: 23.9.1
     hooks:
     -   id: black
 
 -   repo: https://github.com/sqlalchemyorg/zimports
-    rev: v0.4.1
+    rev: v0.6.0
     hooks:
     -   id: zimports
 

mako/cmd.py

@@ -25,7 +25,6 @@ def _exit():
 
 
 def cmdline(argv=None):
-
     parser = ArgumentParser()
     parser.add_argument(
         "--var",

mako/codegen.py

@@ -816,7 +816,6 @@ def visitExpression(self, node):
             )
             or len(self.compiler.default_filters)
         ):
-
             s = self.create_filter_callable(
                 node.escapes_code.args, "%s" % node.text, True
             )
@@ -1181,7 +1180,6 @@ def visitDefTag(self, node):
 
     def visitBlockTag(self, node):
         if node is not self.node and not node.is_anonymous:
-
             if isinstance(self.node, parsetree.DefTag):
                 raise exceptions.CompileException(
                     "Named block '%s' not allowed inside of def '%s'"

mako/lookup.py

@@ -178,7 +178,6 @@ def __init__(
         lexer_cls=None,
         include_error_handler=None,
     ):
-
         self.directories = [
             posixpath.normpath(d) for d in util.to_list(directories, ())
         ]

mako/pyparser.py

@@ -64,7 +64,6 @@ def visit_ClassDef(self, node):
         self._add_declared(node.name)
 
     def visit_Assign(self, node):
-
         # flip around the visiting of Assign so the expression gets
         # evaluated first, in the case of a clause like "x=x+5" (x
         # is undeclared)
@@ -99,7 +98,6 @@ def _expand_tuples(self, args):
                 yield arg
 
     def _visit_function(self, node, islambda):
-
         # push function state onto stack.  dont log any more
         # identifiers as "declared" until outside of the function,
         # but keep logging identifiers as "undeclared". track
@@ -122,7 +120,6 @@ def _visit_function(self, node, islambda):
         self.local_ident_stack = local_ident_stack
 
     def visit_For(self, node):
-
         # flip around visit
 
         self.visit(node.iter)

mako/runtime.py

@@ -530,7 +530,7 @@ def include_file(self, uri, **kwargs):
     def _populate(self, d, l):
         for ident in l:
             if ident == "*":
-                for (k, v) in self._get_star():
+                for k, v in self._get_star():
                     d[k] = v
             else:
                 d[ident] = getattr(self, ident)

mako/template.py

@@ -26,7 +26,6 @@
 
 
 class Template:
-
     r"""Represents a compiled template.
 
     :class:`.Template` includes a reference to the original

mako/testing/assertions.py

@@ -103,7 +103,6 @@ def _assert_raises(
     check_context=False,
     cause_cls=None,
 ):
-
     with _expect_raises(except_cls, msg, check_context, cause_cls) as ec:
         callable_(*args, **kwargs)
     return ec.error

test/ext/test_linguaplugin.py

@@ -18,7 +18,6 @@ class MockOptions:
 class MakoExtractTest(TemplateTest):
     @pytest.fixture(autouse=True)
     def register_lingua_extractors(self):
-
         from lingua.extractors import register_extractors
 
         register_extractors()

test/test_cache.py

@@ -80,7 +80,6 @@ def invalidate(self, key, **kw):
 
 
 class CacheTest:
-
     real_backend = "simple"
 
     def _install_mock_cache(self, template, implname=None):

test/test_exceptions.py

@@ -232,7 +232,6 @@ def test_utf8_format_exceptions_no_pygments(self):
         )
 
     def test_mod_no_encoding(self):
-
         mod = __import__("test.foo.mod_no_encoding").foo.mod_no_encoding
         try:
             mod.run()

test/test_template.py

@@ -30,7 +30,6 @@ def __exit__(self, *arg):
 
 class MiscTest(TemplateTest):
     def test_crlf_linebreaks(self):
-
         crlf = r"""
 <%
     foo = True
@@ -1164,7 +1163,6 @@ def test_globals(self):
 
 class RichTracebackTest(TemplateTest):
     def _do_test_traceback(self, utf8, memory, syntax):
-
         if memory:
             if syntax:
                 source = (

tox.ini

@@ -27,10 +27,10 @@ deps=
       flake8-builtins
       flake8-docstrings
       flake8-rst-docstrings
-      pydocstyle<4.0.0
+      pydocstyle
       # used by flake8-rst-docstrings
       pygments
-      black==22.3.0
+      black==23.9.1
 commands =
     flake8 ./mako/ ./test/ setup.py --exclude test/templates,test/foo  {posargs}
     black --check .