From: David Lord <davidism@gmail.com>
Date: Wed, 10 Jan 2024 23:22:02 +0000 (-0800)
Subject: Merge branch '3.1.x'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fd91e4d11bdd131d8c12805177dbe74d85e7b82;p=thirdparty%2Fjinja.git

Merge branch '3.1.x'
---

3fd91e4d11bdd131d8c12805177dbe74d85e7b82
diff --cc src/jinja2/parser.py
index 206e4952,3354bc93..dbfe011c
--- a/src/jinja2/parser.py
+++ b/src/jinja2/parser.py
@@@ -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 = []