Skip to content

Commit

Permalink
Address mypy errors on 3.10 w/ asyncio loop parameter (#2580)
Browse files Browse the repository at this point in the history
  • Loading branch information
ichard26 committed Oct 30, 2021
1 parent fac498b commit 9afffac
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGES.md
Expand Up @@ -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)
- Fixed a Python 3.10 compatibility issue where the loop argument was still being passed
even though it has been removed (#2580)

### _Blackd_

Expand Down
5 changes: 4 additions & 1 deletion src/black/__init__.py
Expand Up @@ -763,7 +763,10 @@ async def schedule_formatting(
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)

Expand Down
9 changes: 6 additions & 3 deletions src/black/concurrency.py
Expand Up @@ -42,9 +42,12 @@ def shutdown(loop: asyncio.AbstractEventLoop) -> None:

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.
Expand Down

0 comments on commit 9afffac

Please sign in to comment.