]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
Merge branch '3.1.x'
authorDavid Lord <davidism@gmail.com>
Wed, 10 Jan 2024 23:22:02 +0000 (15:22 -0800)
committerDavid Lord <davidism@gmail.com>
Wed, 10 Jan 2024 23:22:02 +0000 (15:22 -0800)
1  2 
.github/workflows/publish.yaml
CHANGES.rst
src/jinja2/filters.py
src/jinja2/parser.py

Simple merge
diff --cc CHANGES.rst
Simple merge
Simple merge
index 206e49523f3f8331761ccf44efc265085be07c14,3354bc93390f405d9c11b1241b06443135241f22..dbfe011cc826c97fbcf8761be21233d16ab825ea
@@@ -859,16 -859,9 +859,16 @@@ class Parser
          else:
              args.append(None)
  
-         return nodes.Slice(lineno=lineno, *args)
+         return nodes.Slice(lineno=lineno, *args)  # noqa: B026
  
 -    def parse_call_args(self) -> t.Tuple:
 +    def parse_call_args(
 +        self,
 +    ) -> t.Tuple[
 +        t.List[nodes.Expr],
 +        t.List[nodes.Keyword],
 +        t.Union[nodes.Expr, None],
 +        t.Union[nodes.Expr, None],
 +    ]:
          token = self.stream.expect("lparen")
          args = []
          kwargs = []