Skip to content

Commit

Permalink
Merge branch 'master' into receive_nowait
Browse files Browse the repository at this point in the history
  • Loading branch information
agronholm authored Dec 12, 2023
2 parents 7e3b126 + f1d0770 commit f6b9ec1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repos:
- id: trailing-whitespace

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.1.6
rev: v0.1.7
hooks:
- id: ruff
args: [--fix, --show-fixes]
Expand Down
2 changes: 1 addition & 1 deletion src/anyio/_backends/_asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ def started(self, value: T_contra | None = None) -> None:


def iterate_exceptions(
exception: BaseException
exception: BaseException,
) -> Generator[BaseException, None, None]:
if isinstance(exception, BaseExceptionGroup):
for exc in exception.exceptions:
Expand Down
2 changes: 1 addition & 1 deletion src/anyio/_core/_sockets.py
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ def wait_socket_writable(sock: socket.socket) -> Awaitable[None]:


def convert_ipv6_sockaddr(
sockaddr: tuple[str, int, int, int] | tuple[str, int]
sockaddr: tuple[str, int, int, int] | tuple[str, int],
) -> tuple[str, int]:
"""
Convert a 4-tuple IPv6 socket address to a 2-tuple (address, port) format.
Expand Down
3 changes: 2 additions & 1 deletion tests/test_taskgroups.py
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,7 @@ async def typetest_variance_bad(*, task_status: TaskStatus[int]) -> None:
task_status2.started(0.0)

async def typetest_optional_status(
*, task_status: TaskStatus[int] = TASK_STATUS_IGNORED
*,
task_status: TaskStatus[int] = TASK_STATUS_IGNORED,
) -> None:
task_status.started(1)

0 comments on commit f6b9ec1

Please sign in to comment.