Address mypy errors on 3.10 w/ asyncio loop parameter (#2580)

diff --git a/CHANGES.md b/CHANGES.md
index 76a7ca6fd3d22da540dc69707288cdad1d6ef02c..c49516c90818c34658a7ec0109ee0b48996d6676 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,8 @@
 - Add new `--workers` parameter (#2514)
 - Fixed feature detection for positional-only arguments in lambdas (#2532)
 - Bumped typed-ast version minimum to 1.4.3 for 3.10 compatiblity (#2519)
 - Add new `--workers` parameter (#2514)
 - Fixed feature detection for positional-only arguments in lambdas (#2532)
 - Bumped typed-ast version minimum to 1.4.3 for 3.10 compatiblity (#2519)

+- Fixed a Python 3.10 compatibility issue where the loop argument was still being passed
+  even though it has been removed (#2580)

 
 ### _Blackd_
 
 
 ### _Blackd_
 

diff --git a/src/black/__init__.py b/src/black/__init__.py
index 5c6cb672aa2ca3a745b403bccaae50f051c7ad53..c503c1a55f78d9be7088c571572334d9f7cd837e 100644 (file)
--- a/src/black/__init__.py
+++ b/src/black/__init__.py
@@ -763,7 +763,10 @@ async def schedule_formatting(
                     sources_to_cache.append(src)
                 report.done(src, changed)
     if cancelled:
                     sources_to_cache.append(src)
                 report.done(src, changed)
     if cancelled:

-        await asyncio.gather(*cancelled, loop=loop, return_exceptions=True)
+        if sys.version_info >= (3, 7):
+            await asyncio.gather(*cancelled, return_exceptions=True)
+        else:
+            await asyncio.gather(*cancelled, loop=loop, return_exceptions=True)

     if sources_to_cache:
         write_cache(cache, sources_to_cache, mode)
 
     if sources_to_cache:
         write_cache(cache, sources_to_cache, mode)
 

diff --git a/src/black/concurrency.py b/src/black/concurrency.py
index 69d79f534e82fc32267e61a1a10e319ca51585bd..24f67b62f0617f79ab21fa9b036645338a4feb8e 100644 (file)
--- a/src/black/concurrency.py
+++ b/src/black/concurrency.py
@@ -42,9 +42,12 @@ def shutdown(loop: asyncio.AbstractEventLoop) -> None:
 
         for task in to_cancel:
             task.cancel()
 
         for task in to_cancel:
             task.cancel()

-        loop.run_until_complete(
-            asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)
-        )
+        if sys.version_info >= (3, 7):
+            loop.run_until_complete(asyncio.gather(*to_cancel, return_exceptions=True))
+        else:
+            loop.run_until_complete(
+                asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)
+            )

     finally:
         # `concurrent.futures.Future` objects cannot be cancelled once they
         # are already running. There might be some when the `shutdown()` happened.
     finally:
         # `concurrent.futures.Future` objects cannot be cancelled once they
         # are already running. There might be some when the `shutdown()` happened.