refactor: Address formatting issues recently found by shed.

Author: seifertm

pytest_asyncio/plugin.py

@@ -403,7 +403,7 @@ def _apply_contextvar_changes(
 
     def restore_contextvars():
         while context_tokens:
-            (var, token) = context_tokens.pop()
+            var, token = context_tokens.pop()
             var.reset(token)
 
     return restore_contextvars

tests/async_fixtures/test_async_fixtures_contextvars.py

@@ -11,8 +11,7 @@
 import pytest
 from pytest import Pytester
 
-_prelude = dedent(
-    """
+_prelude = dedent("""
     import pytest
     import pytest_asyncio
     from contextlib import contextmanager
@@ -27,16 +26,12 @@ def context_var_manager(value):
             yield
         finally:
             _context_var.reset(token)
-"""
-)
+""")
 
 
 def test_var_from_sync_generator_propagates_to_async(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest.fixture
         def var_fixture():
             with context_var_manager("value"):
@@ -49,19 +44,14 @@ async def check_var_fixture(var_fixture):
         @pytest.mark.asyncio
         async def test(check_var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_from_async_generator_propagates_to_sync(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def var_fixture():
             with context_var_manager("value"):
@@ -74,19 +64,14 @@ def check_var_fixture(var_fixture):
         @pytest.mark.asyncio
         async def test(check_var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_from_async_fixture_propagates_to_sync(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def var_fixture():
             _context_var.set("value")
@@ -98,19 +83,14 @@ def check_var_fixture(var_fixture):
 
         def test(check_var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_from_generator_reset_before_previous_fixture_cleanup(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def no_var_fixture():
             with pytest.raises(LookupError):
@@ -127,19 +107,14 @@ async def var_fixture(no_var_fixture):
         @pytest.mark.asyncio
         async def test(var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_from_fixture_reset_before_previous_fixture_cleanup(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def no_var_fixture():
             with pytest.raises(LookupError):
@@ -156,19 +131,14 @@ async def var_fixture(no_var_fixture):
         @pytest.mark.asyncio
         async def test(var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_previous_value_restored_after_fixture(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def var_fixture_1():
             with context_var_manager("value1"):
@@ -184,19 +154,14 @@ async def var_fixture_2(var_fixture_1):
         @pytest.mark.asyncio
         async def test(var_fixture_2):
             assert _context_var.get() == "value2"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_var_set_to_existing_value_ok(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        _prelude
-        + dedent(
-            """
+    pytester.makepyfile(_prelude + dedent("""
         @pytest_asyncio.fixture
         async def var_fixture():
             with context_var_manager("value"):
@@ -210,18 +175,14 @@ async def same_var_fixture(var_fixture):
         @pytest.mark.asyncio
         async def test(same_var_fixture):
             assert _context_var.get() == "value"
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=1)
 
 
 def test_no_isolation_against_context_changes_in_sync_tests(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            """
+    pytester.makepyfile(dedent("""
             import pytest
             import pytest_asyncio
             from contextvars import ContextVar
@@ -234,9 +195,7 @@ def test_sync():
             @pytest.mark.asyncio
             async def test_async():
                 assert _context_var.get() == "new_value"
-            """
-        )
-    )
+            """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=2)
 
@@ -246,9 +205,7 @@ def test_isolation_against_context_changes_in_async_tests(
     pytester: Pytester, loop_scope: Literal["function", "module"]
 ):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            f"""
+    pytester.makepyfile(dedent(f"""
             import pytest
             import pytest_asyncio
             from contextvars import ContextVar
@@ -263,8 +220,6 @@ async def test_async_first():
             async def test_async_second():
                 with pytest.raises(LookupError):
                     _context_var.get()
-            """
-        )
-    )
+            """))
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=2)

tests/async_fixtures/test_shared_module_fixture.py

@@ -9,30 +9,24 @@ def test_asyncio_mark_provides_package_scoped_loop_strict_mode(pytester: Pyteste
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
     pytester.makepyfile(
         __init__="",
-        conftest=dedent(
-            """\
+        conftest=dedent("""\
             import pytest_asyncio
             @pytest_asyncio.fixture(loop_scope="module", scope="module")
             async def async_shared_module_fixture():
                 return True
-            """
-        ),
-        test_module_one=dedent(
-            """\
+            """),
+        test_module_one=dedent("""\
             import pytest
             @pytest.mark.asyncio
             async def test_shared_module_fixture_use_a(async_shared_module_fixture):
                 assert async_shared_module_fixture is True
-            """
-        ),
-        test_module_two=dedent(
-            """\
+            """),
+        test_module_two=dedent("""\
             import pytest
             @pytest.mark.asyncio
             async def test_shared_module_fixture_use_b(async_shared_module_fixture):
                 assert async_shared_module_fixture is True
-            """
-        ),
+            """),
     )
     result = pytester.runpytest("--asyncio-mode=strict")
     result.assert_outcomes(passed=2)

tests/hypothesis/test_base.py

@@ -14,19 +14,15 @@
 
 def test_hypothesis_given_decorator_before_asyncio_mark(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            """\
+    pytester.makepyfile(dedent("""\
             import pytest
             from hypothesis import given, strategies as st
 
             @given(st.integers())
             @pytest.mark.asyncio
             async def test_mark_inner(n):
                 assert isinstance(n, int)
-            """
-        )
-    )
+            """))
     result = pytester.runpytest("--asyncio-mode=strict", "-W default")
     result.assert_outcomes(passed=1)
 
@@ -47,9 +43,7 @@ async def test_mark_and_parametrize(x, y):
 
 def test_async_auto_marked(pytester: Pytester):
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            """\
+    pytester.makepyfile(dedent("""\
         import asyncio
         import pytest
         from hypothesis import given
@@ -60,19 +54,15 @@ def test_async_auto_marked(pytester: Pytester):
         @given(n=st.integers())
         async def test_hypothesis(n: int):
             assert isinstance(n, int)
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)
 
 
 def test_sync_not_auto_marked(pytester: Pytester):
     """Assert that synchronous Hypothesis functions are not marked with asyncio"""
     pytester.makeini("[pytest]\nasyncio_default_fixture_loop_scope = function")
-    pytester.makepyfile(
-        dedent(
-            """\
+    pytester.makepyfile(dedent("""\
         import asyncio
         import pytest
         from hypothesis import given
@@ -85,8 +75,6 @@ def test_hypothesis(request, n: int):
             markers = [marker.name for marker in request.node.own_markers]
             assert "asyncio" not in markers
             assert isinstance(n, int)
-        """
-        )
-    )
+        """))
     result = pytester.runpytest("--asyncio-mode=auto")
     result.assert_outcomes(passed=1)