refactoring

kvmd/apps/kvmd/api/log.py

@@ -52,11 +52,11 @@ class LogApi:
             raise LogReaderDisabledError()
         seek = valid_log_seek(req.query.get("seek", 0))
         follow = valid_bool(req.query.get("follow", False))
-        response = await start_streaming(req, "text/plain")
+        resp = await start_streaming(req, "text/plain")
         async for record in self.__log_reader.poll_log(seek, follow):
-            await response.write(("[%s %s] --- %s" % (
+            await resp.write(("[%s %s] --- %s" % (
                 record["dt"].strftime("%Y-%m-%d %H:%M:%S"),
                 record["service"],
                 record["msg"],
             )).encode("utf-8") + b"\r\n")
-        return response
+        return resp

kvmd/apps/kvmd/api/msd.py

@@ -127,10 +127,10 @@ class MsdApi:
                 src = compressed()
                 size = -1
 
-            response = await start_streaming(req, "application/octet-stream", size, name + suffix)
+            resp = await start_streaming(req, "application/octet-stream", size, name + suffix)
             async for chunk in src:
-                await response.write(chunk)
-            return response
+                await resp.write(chunk)
+            return resp
 
     # =====
 
@@ -160,11 +160,11 @@ class MsdApi:
 
         name = ""
         size = written = 0
-        response: (StreamResponse | None) = None
+        resp: (StreamResponse | None) = None
 
         async def stream_write_info() -> None:
-            assert response is not None
-            await stream_json(response, self.__make_write_info(name, size, written))
+            assert resp is not None
+            await stream_json(resp, self.__make_write_info(name, size, written))
 
         try:
             async with htclient.download(
@@ -184,7 +184,7 @@ class MsdApi:
                 get_logger(0).info("Downloading image %r as %r to MSD ...", url, name)
                 async with self.__msd.write_image(name, size, remove_incomplete) as writer:
                     chunk_size = writer.get_chunk_size()
-                    response = await start_streaming(req, "application/x-ndjson")
+                    resp = await start_streaming(req, "application/x-ndjson")
                     await stream_write_info()
                     last_report_ts = 0
                     async for chunk in remote.content.iter_chunked(chunk_size):
@@ -195,12 +195,12 @@ class MsdApi:
                             last_report_ts = now
 
                 await stream_write_info()
-                return response
+                return resp
 
         except Exception as ex:
-            if response is not None:
+            if resp is not None:
                 await stream_write_info()
-                await stream_json_exception(response, ex)
+                await stream_json_exception(resp, ex)
             elif isinstance(ex, aiohttp.ClientError):
                 return make_json_exception(ex, 400)
             raise

kvmd/apps/kvmd/info/fan.py

@@ -99,9 +99,9 @@ class FanInfoSubmanager(BaseInfoSubmanager):
     async def __get_fan_state(self) -> (dict | None):
         try:
             async with self.__make_http_session() as session:
-                async with session.get("http://localhost/state") as response:
-                    htclient.raise_not_200(response)
-                    return (await response.json())["result"]
+                async with session.get("http://localhost/state") as resp:
+                    htclient.raise_not_200(resp)
+                    return (await resp.json())["result"]
         except Exception as ex:
             get_logger(0).error("Can't read fan state: %s", ex)
             return None

kvmd/apps/vnc/rfb/__init__.py

@@ -235,18 +235,18 @@ class RfbClient(RfbClientStream):  # pylint: disable=too-many-instance-attribute
 
         await self._write_struct("handshake server version", "", b"RFB 003.008\n")
 
-        response = await self._read_text("handshake client version", 12)
+        resp = await self._read_text("handshake client version", 12)
         if (
-            not response.startswith("RFB 003.00")
-            or not response.endswith("\n")
-            or response[-2] not in ["3", "5", "7", "8"]
+            not resp.startswith("RFB 003.00")
+            or not resp.endswith("\n")
+            or resp[-2] not in ["3", "5", "7", "8"]
         ):
-            raise RfbError(f"Invalid version response: {response!r}")
+            raise RfbError(f"Invalid version response: {resp!r}")
 
         try:
-            version = int(response[-2])
+            version = int(resp[-2])
         except ValueError:
-            raise RfbError(f"Invalid version response: {response!r}")
+            raise RfbError(f"Invalid version response: {resp!r}")
         self.__rfb_version = (3 if version == 5 else version)
         get_logger(0).info("%s [main]: Using RFB version 3.%d", self._remote, self.__rfb_version)