Update Ruff to v0.0.277 (#96108)

This commit is contained in:
Franck Nijhof 2023-07-09 16:10:23 +02:00 committed by GitHub
parent 479015244d
commit 18dddd6342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 44 deletions

View File

@ -1,6 +1,6 @@
repos: repos:
- repo: https://github.com/astral-sh/ruff-pre-commit - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.272 rev: v0.0.277
hooks: hooks:
- id: ruff - id: ruff
args: args:

View File

@ -210,9 +210,10 @@ class AmcrestChecker(ApiWrapper):
self, *args: Any, **kwargs: Any self, *args: Any, **kwargs: Any
) -> AsyncIterator[httpx.Response]: ) -> AsyncIterator[httpx.Response]:
"""amcrest.ApiWrapper.command wrapper to catch errors.""" """amcrest.ApiWrapper.command wrapper to catch errors."""
async with self._async_command_wrapper(): async with self._async_command_wrapper(), super().async_stream_command(
async with super().async_stream_command(*args, **kwargs) as ret: *args, **kwargs
yield ret ) as ret:
yield ret
@asynccontextmanager @asynccontextmanager
async def _async_command_wrapper(self) -> AsyncIterator[None]: async def _async_command_wrapper(self) -> AsyncIterator[None]:

View File

@ -92,14 +92,15 @@ async def fetch_redirect_uris(hass: HomeAssistant, url: str) -> list[str]:
parser = LinkTagParser("redirect_uri") parser = LinkTagParser("redirect_uri")
chunks = 0 chunks = 0
try: try:
async with aiohttp.ClientSession() as session: async with aiohttp.ClientSession() as session, session.get(
async with session.get(url, timeout=5) as resp: url, timeout=5
async for data in resp.content.iter_chunked(1024): ) as resp:
parser.feed(data.decode()) async for data in resp.content.iter_chunked(1024):
chunks += 1 parser.feed(data.decode())
chunks += 1
if chunks == 10: if chunks == 10:
break break
except asyncio.TimeoutError: except asyncio.TimeoutError:
_LOGGER.error("Timeout while looking up redirect_uri %s", url) _LOGGER.error("Timeout while looking up redirect_uri %s", url)

View File

@ -2,5 +2,5 @@
black==23.3.0 black==23.3.0
codespell==2.2.2 codespell==2.2.2
ruff==0.0.272 ruff==0.0.277
yamllint==1.28.0 yamllint==1.28.0

View File

@ -31,9 +31,8 @@ async def test_simple_global_timeout_freeze() -> None:
"""Test a simple global timeout freeze.""" """Test a simple global timeout freeze."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2): async with timeout.async_timeout(0.2), timeout.async_freeze():
async with timeout.async_freeze(): await asyncio.sleep(0.3)
await asyncio.sleep(0.3)
async def test_simple_zone_timeout_freeze_inside_executor_job( async def test_simple_zone_timeout_freeze_inside_executor_job(
@ -46,9 +45,10 @@ async def test_simple_zone_timeout_freeze_inside_executor_job(
with timeout.freeze("recorder"): with timeout.freeze("recorder"):
time.sleep(0.3) time.sleep(0.3)
async with timeout.async_timeout(1.0): async with timeout.async_timeout(1.0), timeout.async_timeout(
async with timeout.async_timeout(0.2, zone_name="recorder"): 0.2, zone_name="recorder"
await hass.async_add_executor_job(_some_sync_work) ):
await hass.async_add_executor_job(_some_sync_work)
async def test_simple_global_timeout_freeze_inside_executor_job( async def test_simple_global_timeout_freeze_inside_executor_job(
@ -75,9 +75,10 @@ async def test_mix_global_timeout_freeze_and_zone_freeze_inside_executor_job(
with timeout.freeze("recorder"): with timeout.freeze("recorder"):
time.sleep(0.3) time.sleep(0.3)
async with timeout.async_timeout(0.1): async with timeout.async_timeout(0.1), timeout.async_timeout(
async with timeout.async_timeout(0.2, zone_name="recorder"): 0.2, zone_name="recorder"
await hass.async_add_executor_job(_some_sync_work) ):
await hass.async_add_executor_job(_some_sync_work)
async def test_mix_global_timeout_freeze_and_zone_freeze_different_order( async def test_mix_global_timeout_freeze_and_zone_freeze_different_order(
@ -108,9 +109,10 @@ async def test_mix_global_timeout_freeze_and_zone_freeze_other_zone_inside_execu
with pytest.raises(asyncio.TimeoutError): with pytest.raises(asyncio.TimeoutError):
async with timeout.async_timeout(0.1): async with timeout.async_timeout(0.1):
async with timeout.async_timeout(0.2, zone_name="recorder"): async with timeout.async_timeout(
async with timeout.async_timeout(0.2, zone_name="not_recorder"): 0.2, zone_name="recorder"
await hass.async_add_executor_job(_some_sync_work) ), timeout.async_timeout(0.2, zone_name="not_recorder"):
await hass.async_add_executor_job(_some_sync_work)
async def test_mix_global_timeout_freeze_and_zone_freeze_inside_executor_job_second_job_outside_zone_context( async def test_mix_global_timeout_freeze_and_zone_freeze_inside_executor_job_second_job_outside_zone_context(
@ -136,9 +138,8 @@ async def test_simple_global_timeout_freeze_with_executor_job(
"""Test a simple global timeout freeze with executor job.""" """Test a simple global timeout freeze with executor job."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2): async with timeout.async_timeout(0.2), timeout.async_freeze():
async with timeout.async_freeze(): await hass.async_add_executor_job(lambda: time.sleep(0.3))
await hass.async_add_executor_job(lambda: time.sleep(0.3))
async def test_simple_global_timeout_freeze_reset() -> None: async def test_simple_global_timeout_freeze_reset() -> None:
@ -185,18 +186,16 @@ async def test_simple_zone_timeout_freeze() -> None:
"""Test a simple zone timeout freeze.""" """Test a simple zone timeout freeze."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2, "test"): async with timeout.async_timeout(0.2, "test"), timeout.async_freeze("test"):
async with timeout.async_freeze("test"): await asyncio.sleep(0.3)
await asyncio.sleep(0.3)
async def test_simple_zone_timeout_freeze_without_timeout() -> None: async def test_simple_zone_timeout_freeze_without_timeout() -> None:
"""Test a simple zone timeout freeze on a zone that does not have a timeout set.""" """Test a simple zone timeout freeze on a zone that does not have a timeout set."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.1, "test"): async with timeout.async_timeout(0.1, "test"), timeout.async_freeze("test"):
async with timeout.async_freeze("test"): await asyncio.sleep(0.3)
await asyncio.sleep(0.3)
async def test_simple_zone_timeout_freeze_reset() -> None: async def test_simple_zone_timeout_freeze_reset() -> None:
@ -214,29 +213,28 @@ async def test_mix_zone_timeout_freeze_and_global_freeze() -> None:
"""Test a mix zone timeout freeze and global freeze.""" """Test a mix zone timeout freeze and global freeze."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2, "test"): async with timeout.async_timeout(0.2, "test"), timeout.async_freeze(
async with timeout.async_freeze("test"): "test"
async with timeout.async_freeze(): ), timeout.async_freeze():
await asyncio.sleep(0.3) await asyncio.sleep(0.3)
async def test_mix_global_and_zone_timeout_freeze_() -> None: async def test_mix_global_and_zone_timeout_freeze_() -> None:
"""Test a mix zone timeout freeze and global freeze.""" """Test a mix zone timeout freeze and global freeze."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2, "test"): async with timeout.async_timeout(
async with timeout.async_freeze(): 0.2, "test"
async with timeout.async_freeze("test"): ), timeout.async_freeze(), timeout.async_freeze("test"):
await asyncio.sleep(0.3) await asyncio.sleep(0.3)
async def test_mix_zone_timeout_freeze() -> None: async def test_mix_zone_timeout_freeze() -> None:
"""Test a mix zone timeout global freeze.""" """Test a mix zone timeout global freeze."""
timeout = TimeoutManager() timeout = TimeoutManager()
async with timeout.async_timeout(0.2, "test"): async with timeout.async_timeout(0.2, "test"), timeout.async_freeze():
async with timeout.async_freeze(): await asyncio.sleep(0.3)
await asyncio.sleep(0.3)
async def test_mix_zone_timeout() -> None: async def test_mix_zone_timeout() -> None: