From: David Lord <davidism@gmail.com>
Date: Sun, 31 Jan 2021 07:07:30 +0000 (-0800)
Subject: fix new formatting issues
X-Git-Tag: 3.0.0rc1~44^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a30f92d246799e7c1620a18d2e65951ee79afe50;p=thirdparty%2Fjinja.git

fix new formatting issues
---

diff --git a/setup.py b/setup.py
index 184023af..f6cd2915 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ import re
 
 from setuptools import setup
 
-with open("src/jinja2/__init__.py", "rt", encoding="utf8") as f:
+with open("src/jinja2/__init__.py", encoding="utf8") as f:
     version = re.search(r'__version__ = "(.*?)"', f.read(), re.M).group(1)
 
 # Metadata goes in setup.cfg. These are here for GitHub's dependency graph.
diff --git a/src/jinja2/parser.py b/src/jinja2/parser.py
index 589cca27..9bdecba9 100644
--- a/src/jinja2/parser.py
+++ b/src/jinja2/parser.py
@@ -322,10 +322,14 @@ class Parser:
         node.names = []
 
         def parse_context():
-            if self.stream.current.value in (
-                "with",
-                "without",
-            ) and self.stream.look().test("name:context"):
+            if (
+                self.stream.current.value
+                in {
+                    "with",
+                    "without",
+                }
+                and self.stream.look().test("name:context")
+            ):
                 node.with_context = next(self.stream).value == "with"
                 self.stream.skip()
                 return True
@@ -868,15 +872,19 @@ class Parser:
         kwargs = []
         if self.stream.current.type == "lparen":
             args, kwargs, dyn_args, dyn_kwargs = self.parse_call(None)
-        elif self.stream.current.type in (
-            "name",
-            "string",
-            "integer",
-            "float",
-            "lparen",
-            "lbracket",
-            "lbrace",
-        ) and not self.stream.current.test_any("name:else", "name:or", "name:and"):
+        elif (
+            self.stream.current.type
+            in {
+                "name",
+                "string",
+                "integer",
+                "float",
+                "lparen",
+                "lbracket",
+                "lbrace",
+            }
+            and not self.stream.current.test_any("name:else", "name:or", "name:and")
+        ):
             if self.stream.current.test("name:is"):
                 self.fail("You cannot chain multiple tests with is")
             arg_node = self.parse_primary()
diff --git a/src/jinja2/runtime.py b/src/jinja2/runtime.py
index 950f620d..166f34f0 100644
--- a/src/jinja2/runtime.py
+++ b/src/jinja2/runtime.py
@@ -808,7 +808,7 @@ def make_logging_undefined(logger=None, base=None):
             try:
                 return super()._fail_with_undefined_error(*args, **kwargs)
             except self._undefined_exception as e:
-                logger.error(f"Template variable error: %s", e)
+                logger.error("Template variable error: %s", e)
                 raise e
 
         def __str__(self):
diff --git a/src/jinja2/utils.py b/src/jinja2/utils.py
index 8c80ccc7..84185fad 100644
--- a/src/jinja2/utils.py
+++ b/src/jinja2/utils.py
@@ -161,8 +161,7 @@ def object_type_repr(obj):
 
 
 def pformat(obj):
-    """Format an object using :func:`pprint.pformat`.
-    """
+    """Format an object using :func:`pprint.pformat`."""
     from pprint import pformat
 
     return pformat(obj)
diff --git a/tests/test_async.py b/tests/test_async.py
index bfdcdb21..5cc8ba68 100644
--- a/tests/test_async.py
+++ b/tests/test_async.py
@@ -258,7 +258,7 @@ class TestAsyncIncludes:
 
     def test_unoptimized_scopes_autoescape(self):
         env = Environment(
-            loader=DictLoader(dict(o_printer="({{ o }})",)),
+            loader=DictLoader({"o_printer": "({{ o }})"}),
             autoescape=True,
             enable_async=True,
         )
diff --git a/tests/test_filters.py b/tests/test_filters.py
index c3ff8f32..3cd0fdd1 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -198,7 +198,7 @@ class TestFilter:
 
     @pytest.mark.parametrize(
         ("value", "base", "expect"),
-        (("0x4d32", 16, "19762"), ("011", 8, "9"), ("0x33Z", 16, "0"),),
+        (("0x4d32", 16, "19762"), ("011", 8, "9"), ("0x33Z", 16, "0")),
     )
     def test_int_base(self, env, value, base, expect):
         t = env.from_string("{{ value|int(base=base) }}")
@@ -540,7 +540,7 @@ class TestFilter:
         t = env.from_string(source)
         assert t.render() == expect
 
-    @pytest.mark.parametrize("name,expect", (("min", "1"), ("max", "9"),))
+    @pytest.mark.parametrize(("name", "expect"), [("min", "1"), ("max", "9")])
     def test_min_max_attribute(self, env, name, expect):
         t = env.from_string("{{ items|" + name + '(attribute="value") }}')
         assert t.render(items=map(Magic, [5, 1, 9])) == expect
diff --git a/tests/test_lexnparse.py b/tests/test_lexnparse.py
index 96e134d1..f4857668 100644
--- a/tests/test_lexnparse.py
+++ b/tests/test_lexnparse.py
@@ -998,7 +998,7 @@ class TestTrimBlocks:
 
     def test_no_trim_angle_bracket(self, env):
         env = Environment(
-            "<%", "%>", "${", "}", "<%#", "%>", lstrip_blocks=True, trim_blocks=True,
+            "<%", "%>", "${", "}", "<%#", "%>", lstrip_blocks=True, trim_blocks=True
         )
         tmpl = env.from_string("    <% if True +%>\n\n    <% endif %>")
         assert tmpl.render() == "\n\n"